← Back to branch summary

~ubuntu-branches/debian/sid/hal/sid

« back to all changes in this revision

Viewing changes to tools/hal-device.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2007-10-23 12:33:58 UTC
  • Revision ID: james.westby@ubuntu.com-20071023123358-xaf8mjc5n84d5gtz
Tags: upstream-0.5.10
Import upstream version 0.5.10

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/hal-device.c
198
198
                        udi = arg;
199
199
                } else {
200
200
#ifdef HAVE_ASPRINTF
201
 
                        asprintf(&udi, "/org/freedesktop/Hal/devices/%s", arg);
 
201
                        if (asprintf(&udi, "/org/freedesktop/Hal/devices/%s", arg) == -1) 
 
202
                                return 30;
202
203
#else
203
204
                        udi = calloc(1, sizeof ("/org/freedesktop/Hal/devices/%s") + strlen(arg));
204
205
                        sprintf(udi, "/org/freedesktop/Hal/devices/%s", arg);
306
307
        DBusError error;
307
308
        char *udi;
308
309
 
309
 
        if (!arg) return 11;
 
310
        if (!arg) return 10;
310
311
 
311
312
        if (*arg == '/') {
312
313
                udi = arg;
313
314
        } else {
314
315
#ifdef HAVE_ASPRINTF
315
 
                asprintf(&udi, "/org/freedesktop/Hal/devices/%s", arg);
 
316
                if(asprintf(&udi, "/org/freedesktop/Hal/devices/%s", arg) == -1)
 
317
                        return 11;
316
318
#else
317
319
                udi = calloc(1, sizeof ("/org/freedesktop/Hal/devices/%s") + strlen(arg));
318
320
                sprintf(udi, "/org/freedesktop/Hal/devices/%s", arg);
346
348
        int err;
347
349
 
348
350
        if (!arg)
349
 
                return 21;
 
351
                return 20;
350
352
 
351
353
        if (*arg == '/') {
352
354
                udi = arg;
353
355
        } else {
354
356
#ifdef HAVE_ASPRINTF
355
 
                asprintf(&udi, "/org/freedesktop/Hal/devices/%s", arg);
 
357
                if (asprintf(&udi, "/org/freedesktop/Hal/devices/%s", arg) == -1)
 
358
                        return 21;
356
359
#else
357
360
                udi = calloc(1, sizeof ("/org/freedesktop/Hal/devices/%s") + strlen(arg));
358
361
                sprintf(udi, "/org/freedesktop/Hal/devices/%s", arg);