wok diff hplip/stuff/hplip-3.9.4b-glibc210.u @ rev 8983

Up: mercurial to 1.8.
author Christopher Rogers <slaxemulator@gmail.com>
date Wed Mar 02 15:39:38 2011 +0000 (2011-03-02)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/hplip/stuff/hplip-3.9.4b-glibc210.u	Wed Mar 02 15:39:38 2011 +0000
     1.3 @@ -0,0 +1,22 @@
     1.4 +--- prnt/hpijs/registry.cpp.orig	2009-04-29 22:41:07.000000000 +0200
     1.5 ++++ prnt/hpijs/registry.cpp	2009-06-02 14:17:09.000000000 +0200
     1.6 +@@ -292,7 +292,7 @@ DRIVER_ERROR DeviceRegistry::SelectDevic
     1.7 +             device = eDJ3320;
     1.8 +             match = TRUE;
     1.9 +         }
    1.10 +-		char	*cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
    1.11 ++		const char	*cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
    1.12 + 		if (!cmdStr)
    1.13 + 		{
    1.14 + 			cmdStr = strstr ((const char *) DevIDBuffer+2, "COMMAND SET:");
    1.15 +--- prnt/hpijs/dj3320.cpp.orig	2009-04-29 22:41:07.000000000 +0200
    1.16 ++++ prnt/hpijs/dj3320.cpp	2009-06-02 14:32:21.000000000 +0200
    1.17 +@@ -429,7 +429,7 @@ DISPLAY_STATUS DJ3320::ParseError (BYTE
    1.18 +             pLDLEncap->bNewStatus = FALSE;
    1.19 + 
    1.20 +             // First 10 bytes of m_pbyReadBuff are packet header.  Status query from printer has $S:
    1.21 +-            if ((pcStr = strstr((const char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL)
    1.22 ++            if ((pcStr = strstr((char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL)
    1.23 +             {
    1.24 +                 m_dsCurrentStatus = DISPLAY_COMM_PROBLEM;
    1.25 +                 return DISPLAY_COMM_PROBLEM;