Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > media > main-testing-src > by-pkgid > 71e19431ee497cf11e442b642c771018 > files > 2

hplip-3.9.2-0.1mdv2009.0.src.rpm

diff -ur hplip-2.8.12-orig/pcard/ptest.c hplip-2.8.12/pcard/ptest.c
--- hplip-2.8.12-orig/pcard/ptest.c	2008-12-17 21:40:19.000000000 +0100
+++ hplip-2.8.12/pcard/ptest.c	2008-12-23 18:45:17.000000000 +0100
@@ -78,8 +78,8 @@
    if ((n = vsnprintf(buf, 256, fmt, args)) == -1)
       buf[255] = 0;     /* output was truncated */
 
-   fprintf(stderr, buf);
-   syslog(LOG_WARNING, buf);
+   fprintf(stderr, "%s", buf);
+   syslog(LOG_WARNING, "%s", buf);
 
    fflush(stderr);
    va_end(args);
diff -ur hplip-2.8.12-orig/prnt/backend/hp.c hplip-2.8.12/prnt/backend/hp.c
--- hplip-2.8.12-orig/prnt/backend/hp.c	2008-12-17 21:39:37.000000000 +0100
+++ hplip-2.8.12/prnt/backend/hp.c	2008-12-23 18:39:26.000000000 +0100
@@ -149,8 +149,8 @@
    if ((n = vsnprintf(buf, 256, fmt, args)) == -1)
       buf[255] = 0;     /* output was truncated */
 
-   fprintf(stderr, buf);
-   syslog(LOG_ERR, buf);
+   fprintf(stderr, "%s", buf);
+   syslog(LOG_ERR, "%s", buf);
 
    fflush(stderr);
    va_end(args);
diff -ur hplip-2.8.12-orig/prnt/hpijs/hpijs.cpp hplip-2.8.12/prnt/hpijs/hpijs.cpp
--- hplip-2.8.12-orig/prnt/hpijs/hpijs.cpp	2008-12-17 21:39:43.000000000 +0100
+++ hplip-2.8.12/prnt/hpijs/hpijs.cpp	2008-12-23 18:32:05.000000000 +0100
@@ -76,8 +76,8 @@
    if ((n = vsnprintf(buf, 256, fmt, args)) == -1)
       buf[255] = 0;     /* output was truncated */
 
-   fprintf(stderr, buf);
-   syslog(LOG_WARNING, buf);
+   fprintf(stderr, "%s", buf);
+   syslog(LOG_WARNING, "%s", buf);
 
    fflush(stderr);
    va_end(args);
@@ -466,7 +466,7 @@
    }
    else if (!strcmp (key, "ColorSpace"))
    {
-      return snprintf(value_buf, value_size, pSS->ph.cs);
+      return snprintf(value_buf, value_size, "%s", pSS->ph.cs);
    }
    else if (!strcmp (key, "PageImageFormat"))
    {
diff -ur hplip-2.8.12-orig/prnt/hpijs/hpijsfax.cpp hplip-2.8.12/prnt/hpijs/hpijsfax.cpp
--- hplip-2.8.12-orig/prnt/hpijs/hpijsfax.cpp	2008-12-17 21:39:43.000000000 +0100
+++ hplip-2.8.12/prnt/hpijs/hpijsfax.cpp	2008-12-23 18:35:57.000000000 +0100
@@ -236,7 +236,7 @@
 	}
 	else if (!strcmp (key, "ColorSpace"))
 	{
-		return snprintf (value_buf, value_size, pFaxStruct->ph.cs);
+		return snprintf (value_buf, value_size, "%s", pFaxStruct->ph.cs);
 	}
 	else if (!strcmp (key, "PageImageFormat"))
 	{
diff -ur hplip-2.8.12-orig/scan/sane/common.c hplip-2.8.12/scan/sane/common.c
--- hplip-2.8.12-orig/scan/sane/common.c	2008-12-17 21:40:16.000000000 +0100
+++ hplip-2.8.12/scan/sane/common.c	2008-12-23 18:30:18.000000000 +0100
@@ -44,8 +44,8 @@
    va_start(args, fmt);
    if ((n = vsnprintf(buf, 256, fmt, args)) == -1)
       buf[255] = 0;     /* output was truncated */
-   syslog(LOG_WARNING, buf);
-   DBG(2, buf);
+   syslog(LOG_WARNING, "%s", buf);
+   DBG(2, "%s", buf);
    va_end(args);
    return n;
 }