Sophie

Sophie

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

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

diff -up hplip-3.9.2/prnt/hpijs/dj3320.cpp.strstr-const hplip-3.9.2/prnt/hpijs/dj3320.cpp
--- hplip-3.9.2/prnt/hpijs/dj3320.cpp.strstr-const	2009-02-20 00:38:04.000000000 +0000
+++ hplip-3.9.2/prnt/hpijs/dj3320.cpp	2009-02-20 11:27:51.000000000 +0000
@@ -403,7 +403,7 @@ DISPLAY_STATUS DJ3320::ParseError (BYTE 
 {
     DRIVER_ERROR err = NO_ERROR;
     BYTE byDevIDBuffer[DevIDBuffSize];
-    char *pcStr = NULL;
+    const char *pcStr = NULL;
     BYTE byStatus1, byStatus2;
 
     memset(byDevIDBuffer, 0, sizeof(byDevIDBuffer));
diff -up hplip-3.9.2/prnt/hpijs/registry.cpp.strstr-const hplip-3.9.2/prnt/hpijs/registry.cpp
--- hplip-3.9.2/prnt/hpijs/registry.cpp.strstr-const	2009-02-20 00:38:04.000000000 +0000
+++ hplip-3.9.2/prnt/hpijs/registry.cpp	2009-02-20 11:27:00.000000000 +0000
@@ -292,15 +292,15 @@ DRIVER_ERROR DeviceRegistry::SelectDevic
             device = eDJ3320;
             match = TRUE;
         }
-		char	*cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
+		const char	*cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
 		if (!cmdStr)
 		{
 			cmdStr = strstr ((const char *) DevIDBuffer+2, "COMMAND SET:");
 		}
-		if (!match && cmdStr && (strstr ((const char *) cmdStr+4, "POSTSCRIPT") || 
-			                     strstr ((const char *) cmdStr+4, "PostScript") || 
-					             strstr ((const char *) cmdStr+4, "Postscript") || 
-					             strstr ((const char *) cmdStr+4, "postscript") ))
+		if (!match && cmdStr && (strstr (cmdStr+4, "POSTSCRIPT") || 
+			                     strstr (cmdStr+4, "PostScript") || 
+					             strstr (cmdStr+4, "Postscript") || 
+					             strstr (cmdStr+4, "postscript") ))
 		{
 			device = ePScript;
 			match = TRUE;