From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Fri, 3 Apr 2015 00:33:05 +0000 (+0000)
Subject: Fix some clang issues.
X-Git-Tag: v2.2b1~323
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8fdb00125304cb18187b1fe418753d698b53c71;p=thirdparty%2Fcups.git

Fix some clang issues.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12583 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c
index 8b70c621ca..b3e14b03fe 100644
--- a/backend/usb-darwin.c
+++ b/backend/usb-darwin.c
@@ -302,7 +302,7 @@ static void parse_pserror (char *sockBuffer, int len);
 
 static IOUSBInterfaceInterface220 **usb_interface220_for_service(io_service_t usbClass);
 static IOUSBDeviceInterface **usb_device_interface_for_device(io_service_t usbDevice);
-static CFStringRef printer_interface_deviceid(IOUSBInterfaceInterface220 **printer, UInt8 alternateSetting);
+static CFStringRef copy_printer_interface_deviceid(IOUSBInterfaceInterface220 **printer, UInt8 alternateSetting);
 static CFStringRef printer_interface_indexed_description(IOUSBInterfaceInterface220 ** printer, UInt8 index, UInt16 language);
 static CFStringRef deviceIDCopyManufacturer(CFStringRef deviceID);
 static CFStringRef deviceIDCopyModel(CFStringRef deviceID);
@@ -1175,7 +1175,7 @@ static void device_added(void *userdata, io_iterator_t iterator)
 
                 if (IsPrintingInterface(intfClass, intfSubclass, intfProtocol))
                 {
-                    CFStringRef deviceIDString = printer_interface_deviceid(intf220, 0);
+                    CFStringRef deviceIDString = copy_printer_interface_deviceid(intf220, 0);
                     if (deviceIDString != NULL)
                     {
                         reference->keepRunning = reference->callback(userdata, intf, deviceIDString, locationID, intfNumber, 0);
@@ -1192,7 +1192,7 @@ static void device_added(void *userdata, io_iterator_t iterator)
 
                     if ((IsPrintingInterface(intfClass, intfSubclass, intfProtocol)))
                     {
-                        CFStringRef deviceIDString = printer_interface_deviceid(intf220, intfDesc->bAlternateSetting);
+                        CFStringRef deviceIDString = copy_printer_interface_deviceid(intf220, intfDesc->bAlternateSetting);
                         if (deviceIDString != NULL)
                         {
                             reference->keepRunning = reference->callback(userdata, intf, deviceIDString, locationID, intfNumber, intfDesc->bAlternateSetting);
@@ -1555,7 +1555,7 @@ static IOUSBDeviceInterface **usb_device_interface_for_device(io_service_t usbDe
 }
 
 
-static CFStringRef printer_interface_deviceid(IOUSBInterfaceInterface220 **printer, UInt8 alternateSetting)
+static CFStringRef copy_printer_interface_deviceid(IOUSBInterfaceInterface220 **printer, UInt8 alternateSetting)
 {
 	// I have tried to make this function as neat as I can, but the possibility of needing to resend
 	// a request to get the entire string makes it hideous...
@@ -2447,7 +2447,7 @@ static void get_device_id(cups_sc_status_t *status,
     IOUSBInterfaceInterface220 **intf220 = usb_interface220_for_service(g.printer_obj);
     if (intf220)
     {
-      deviceIDString = printer_interface_deviceid(intf220, g.alternateSetting);
+      deviceIDString = copy_printer_interface_deviceid(intf220, g.alternateSetting);
       (*intf220)->Release(intf220);
     }
   }
diff --git a/scheduler/printers.c b/scheduler/printers.c
index ac4b26db24..262c9908fd 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1425,7 +1425,7 @@ cupsdSaveAllPrinters(void)
     {
       cupsFilePuts(fp, "State Stopped\n");
 
-      if (printer->state_message)
+      if (printer->state_message[0])
         cupsFilePutConf(fp, "StateMessage", printer->state_message);
     }
     else
@@ -3485,8 +3485,7 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
 	 filter;
 	 filter = (mime_filter_t *)cupsArrayNext(MimeDatabase->filters))
     {
-      if (filter->dst == p->filetype && filter->filter &&
-	  strstr(filter->filter, "PrintJobMgr"))
+      if (filter->dst == p->filetype && strstr(filter->filter, "PrintJobMgr"))
 	break;
     }
 
diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index b99208db10..e059491381 100644
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -2377,10 +2377,9 @@ check_filters(ppd_file_t *ppd,		/* I - PPD file */
 
     if (!strncmp(program, "maxsize(", 8))
     {
-      size_t	maxsize;		/* Maximum file size */
       char	*mptr;			/* Pointer into maxsize(nnnn) program */
 
-      maxsize = (size_t)strtoll(program + 8, &mptr, 10);
+      strtoll(program + 8, &mptr, 10);
 
       if (*mptr != ')')
       {
@@ -2496,10 +2495,9 @@ check_filters(ppd_file_t *ppd,		/* I - PPD file */
 
     if (!strncmp(program, "maxsize(", 8))
     {
-      size_t	maxsize;		/* Maximum file size */
       char	*mptr;			/* Pointer into maxsize(nnnn) program */
 
-      maxsize = (size_t)strtoll(program + 8, &mptr, 10);
+      strtoll(program + 8, &mptr, 10);
 
       if (*mptr != ')')
       {