~ubuntu-branches/debian/squeeze/hal/squeeze

« back to all changes in this revision

Viewing changes to tools/lshal.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2008-03-05 18:14:57 UTC
  • Revision ID: james.westby@ubuntu.com-20080305181457-fj989u7likg0vd6b
Tags: upstream-0.5.10+git20080301
ImportĀ upstreamĀ versionĀ 0.5.10+git20080301

Show diffs side-by-side

added added

removed removed

Lines of Context:
171
171
                        printf ("  %s = {", libhal_psi_get_key (&it));
172
172
 
173
173
                        strlist = libhal_psi_get_strlist (&it);
174
 
                        for (i = 0; strlist[i] != 0; i++) {
 
174
                        for (i = 0; strlist[i] != NULL; i++) {
175
175
                                printf ("'%s'", strlist[i]);
176
176
                                if (strlist[i+1] != NULL)
177
177
                                        printf (", ");
482
482
                strlist = libhal_device_get_property_strlist (hal_ctx, udi, key, &error);
483
483
                /* may be NULL because property may have been removed */
484
484
                if (strlist != NULL) {
485
 
                        for (i = 0; strlist[i] != 0; i++) {
 
485
                        for (i = 0; strlist[i] != NULL; i++) {
486
486
                                printf ("'%s'", strlist[i]);
487
487
                                if (strlist[i+1] != NULL)
488
488
                                        printf (", ");
826
826
        libhal_ctx_set_interface_lock_acquired (hal_ctx, interface_lock_acquired);
827
827
        libhal_ctx_set_interface_lock_released (hal_ctx, interface_lock_released);
828
828
 
829
 
        if (show_device)
 
829
        if (show_device) {
 
830
                long_list = TRUE;
830
831
                dump_device (show_device);
 
832
        }
831
833
        else if (!do_monitor)
832
834
                dump_devices ();
833
835