replace remaining %m printf glibc extension with %s strerror(errno)

[netatalk.git] / etc / papd / print_cups.c

diff --git a/etc/papd/print_cups.c b/etc/papd/print_cups.c
index dbc91157536a63b7a501d7a4706c2fd22d7d107c..aee03dd12bac7c2061fa2dc0e835fd611af50cdf 100644 (file)
--- a/etc/papd/print_cups.c
+++ b/etc/papd/print_cups.c
@@ -1,5 +1,5 @@
 /*
- * $Id: print_cups.c,v 1.1.2.1 2004-06-09 01:25:54 bfernhomberg Exp $
+ * $Id: print_cups.c,v 1.1.2.1.2.3 2008-11-14 10:04:52 didg Exp $
  *
  * Copyright 2004 Bjoern Fernhomberg.
  *
@@ -79,7 +79,7 @@ char * cups_get_language ()
  */
 
 static const char *                            /* O - Password or NULL */
-cups_passwd_cb(const char *prompt)      /* I - Prompt */
+cups_passwd_cb(const char *prompt _U_)      /* I - Prompt */
 {
  /*
   * Always return NULL to indicate that no password is available...
@@ -113,7 +113,7 @@ cups_printername_ok(char *name)         /* I - Name of printer */
 
         if ((http = httpConnect(cupsServer(), ippPort())) == NULL)
         {
-               LOG(log_error, logtype_papd, "Unable to connect to CUPS server %s - %s\n",
+               LOG(log_error, logtype_papd, "Unable to connect to CUPS server %s - %s",
                          cupsServer(), strerror(errno));
                 return (0);
         }
@@ -156,7 +156,7 @@ cups_printername_ok(char *name)         /* I - Name of printer */
 
         if ((response = cupsDoRequest(http, request, "/")) == NULL)
         {
-               LOG(log_error, logtype_papd, "Unable to get printer status for %s - %s\n", name,
+               LOG(log_error, logtype_papd, "Unable to get printer status for %s - %s", name,
                          ippErrorString(cupsLastError()));
                 httpClose(http);
                 return (0);
@@ -166,7 +166,7 @@ cups_printername_ok(char *name)         /* I - Name of printer */
 
         if (response->request.status.status_code >= IPP_OK_CONFLICT)
         {
-               LOG(log_error, logtype_papd, "Unable to get printer status for %s - %s\n", name,
+               LOG(log_error, logtype_papd, "Unable to get printer status for %s - %s", name,
                          ippErrorString(response->request.status.status_code));
                 ippDelete(response);
                 return (0);
@@ -218,7 +218,7 @@ cups_get_printer_status (struct printer *pr)
 
         if ((http = httpConnect(cupsServer(), ippPort())) == NULL)
         {
-               LOG(log_error, logtype_papd, "Unable to connect to CUPS server %s - %s\n",
+               LOG(log_error, logtype_papd, "Unable to connect to CUPS server %s - %s",
                          cupsServer(), strerror(errno));
                 return (0);
         }
@@ -268,7 +268,7 @@ cups_get_printer_status (struct printer *pr)
 
         if ((response = cupsDoRequest(http, request, "/")) == NULL)
         {
-               LOG(log_error, logtype_papd, "Unable to get printer status for %s - %s\n", pr->p_printer,
+               LOG(log_error, logtype_papd, "Unable to get printer status for %s - %s", pr->p_printer,
                          ippErrorString(cupsLastError()));
                 httpClose(http);
                 return (0);
@@ -276,7 +276,7 @@ cups_get_printer_status (struct printer *pr)
 
         if (response->request.status.status_code >= IPP_OK_CONFLICT)
         {
-               LOG(log_error, logtype_papd, "Unable to get printer status for %s - %s\n", pr->p_printer,
+               LOG(log_error, logtype_papd, "Unable to get printer status for %s - %s", pr->p_printer,
                          ippErrorString(response->request.status.status_code));
                 ippDelete(response);
                 httpClose(http);
@@ -357,7 +357,7 @@ int cups_print_job ( char * name, char *filename, char *job, char *username, cha
        strlcat ( filepath , filename, sizeof(filepath));
        
        if ((jobid = cupsPrintFile( name, filepath, job, 0, options)) == 0)
-               LOG(log_error, logtype_papd, "Unable to print job '%s' (%s) to printer '%s' for user '%s' - CUPS error : '%s'\n", job, filepath, name, username, ippErrorString(cupsLastError()));
+               LOG(log_error, logtype_papd, "Unable to print job '%s' (%s) to printer '%s' for user '%s' - CUPS error : '%s'", job, filepath, name, username, ippErrorString(cupsLastError()));
        else 
                LOG(log_info, logtype_papd, "Job '%s' queued to printer '%s' with id '%d'", job, name, jobid);
 
@@ -384,7 +384,7 @@ cups_autoadd_printers ( struct printer      *defprinter, struct printer *printers)
         for  (i=0; i< num_dests; i++)
         {
                if (( pr = (struct printer *)malloc( sizeof( struct printer ))) == NULL ) {
-                       LOG(log_error, logtype_papd, "malloc: %m" );
+                       LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
                        exit( 1 );
                }
        
@@ -403,7 +403,7 @@ cups_autoadd_printers ( struct printer      *defprinter, struct printer *printers)
                }
 
                if (( pr->p_name = (char *)malloc( strlen( name ) + 1 )) == NULL ) {
-                       LOG(log_error, logtype_papd, "malloc: %m" );
+                       LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
                        exit( 1 );
                }
                strcpy( pr->p_name, name );
@@ -415,14 +415,14 @@ cups_autoadd_printers ( struct printer    *defprinter, struct printer *printers)
                pr->p_flags |= P_CUPS_AUTOADDED;
                        
                if (( pr->p_printer = (char *)malloc( strlen( dests[i].name ) + 1 )) == NULL ) {
-                       LOG(log_error, logtype_papd, "malloc: %m" );
+                       LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
                                exit( 1 );
                }
                strcpy( pr->p_printer, dests[i].name );                 
 
                if ( (p = (char *) cups_get_printer_ppd ( pr->p_printer )) != NULL ) {
                        if (( pr->p_ppdfile = (char *)malloc( strlen( p ) + 1 )) == NULL ) {
-                               LOG(log_error, logtype_papd, "malloc: %m" );
+                               LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
                                        exit( 1 );
                        }
                        strcpy( pr->p_ppdfile, p );
@@ -493,7 +493,7 @@ to_ascii ( char  *inptr, char **outptr)
        char *out, *osav;
 
        if ( NULL == (out = (char*) malloc ( strlen ( inptr) + 1 )) ) {
-               LOG(log_error, logtype_papd, "malloc: %m" );
+               LOG(log_error, logtype_papd, "malloc: %s", strerror(errno) );
                exit (1);
        }