From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Wed, 17 Sep 2008 00:56:20 +0000 (+0000)
Subject: Fix clang-reported errors.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f01463d59de9cd71f354348094c94e982c670b7;p=thirdparty%2Fcups.git

Fix clang-reported errors.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@7952 7a7537e8-13f0-0310-91df-b6672ffda945
---

diff --git a/cups/http-support.c b/cups/http-support.c
index 4bacadab06..7af258600b 100644
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -1298,7 +1298,9 @@ _httpResolveURI(
 			hostname[1024],
 			resource[1024];
   int			port;
+#ifdef DEBUG
   http_uri_status_t	status;		/* URI decode status */
+#endif /* DEBUG */
 
 
   DEBUG_printf(("_httpResolveURI(uri=\"%s\", resolved_uri=%p, "
@@ -1309,10 +1311,17 @@ _httpResolveURI(
   * Get the device URI...
   */
 
+#ifdef DEBUG
   if ((status = httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme,
                                 sizeof(scheme), userpass, sizeof(userpass),
 				hostname, sizeof(hostname), &port, resource,
 				sizeof(resource))) < HTTP_URI_OK)
+#else
+  if (httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme,
+		      sizeof(scheme), userpass, sizeof(userpass),
+		      hostname, sizeof(hostname), &port, resource,
+		      sizeof(resource)) < HTTP_URI_OK)
+#endif /* DEBUG */
   {
     if (log)
       _cupsLangPrintf(stderr, _("Bad device URI \"%s\"!\n"), uri);
diff --git a/scheduler/conf.c b/scheduler/conf.c
index ac1d909aec..a820b3c462 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -3372,6 +3372,8 @@ read_location(cups_file_t *fp,		/* I - Configuration file */
         cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d.", linenum);
         if (FatalErrors & CUPSD_FATAL_CONFIG)
 	  return (0);
+        else
+	  continue;
       }
       
       if ((loc = cupsdCopyLocation(&parent)) == NULL)
@@ -3512,6 +3514,8 @@ read_policy(cups_file_t *fp,		/* I - Configuration file */
         cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d.", linenum);
         if (FatalErrors & CUPSD_FATAL_CONFIG)
 	  return (0);
+        else
+	  continue;
       }
       
      /*
diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c
index 791e9292d3..518dd553d7 100644
--- a/scheduler/cupsfilter.c
+++ b/scheduler/cupsfilter.c
@@ -380,7 +380,8 @@ main(int  argc,				/* I - Number of command-line args */
     return (1);
   }
 
-  add_printer_filters(command, mime, printer, ppdfile, &prefilter_type);
+  printer_type = add_printer_filters(command, mime, printer, ppdfile,
+                                     &prefilter_type);
 
  /*
   * Get the source and destination types...