diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-05-12 06:22:31 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-05-12 06:22:31 +0000 |
| commit | 321d8d57dacf00e4ae19558dc9444519f4d9ade1 (patch) | |
| tree | 6f07778268fd2099c235dd4d2f2d4aa38fcb0110 /backend/ieee1284.c | |
| parent | eac3a0a01bf37d95f4129b28296cb697c54b2613 (diff) | |
| download | cups-321d8d57dacf00e4ae19558dc9444519f4d9ade1.tar.gz | |
Merge changes from CUPS 1.5b1-r9774.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3247 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'backend/ieee1284.c')
| -rw-r--r-- | backend/ieee1284.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/backend/ieee1284.c b/backend/ieee1284.c index bf994891c..13fb5cbeb 100644 --- a/backend/ieee1284.c +++ b/backend/ieee1284.c @@ -46,6 +46,15 @@ backendGetDeviceID( int uri_size) /* I - Size of buffer */ { #ifdef __APPLE__ /* This function is a no-op */ + (void)fd; + (void)device_id; + (void)device_id_size; + (void)make_model; + (void)make_model_size; + (void)scheme; + (void)uri; + (void)uri_size; + return (-1); #else /* Get the device ID from the specified file descriptor... */ @@ -404,10 +413,7 @@ backendGetMakeModel( char temp[1024]; /* Temporary make and model */ - if (mfg) - snprintf(temp, sizeof(temp), "%s %s", mfg, mdl); - else - snprintf(temp, sizeof(temp), "%s", mdl); + snprintf(temp, sizeof(temp), "%s %s", mfg, mdl); _ppdNormalizeMakeAndModel(temp, make_model, make_model_size); } |