wok-6.x annotate hplip/stuff/hplip-3.9.4b-glibc210.u @ rev 21233

updated libhtp and libhtp-dev again (0.2.6 -> 0.5.30)
author Hans-G?nter Theisgen
date Thu Apr 11 13:40:55 2019 +0100 (2019-04-11)
parents
children
rev   line source
jozee@3470 1 --- prnt/hpijs/registry.cpp.orig 2009-04-29 22:41:07.000000000 +0200
jozee@3470 2 +++ prnt/hpijs/registry.cpp 2009-06-02 14:17:09.000000000 +0200
jozee@3470 3 @@ -292,7 +292,7 @@ DRIVER_ERROR DeviceRegistry::SelectDevic
jozee@3470 4 device = eDJ3320;
jozee@3470 5 match = TRUE;
jozee@3470 6 }
jozee@3470 7 - char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
jozee@3470 8 + const char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
jozee@3470 9 if (!cmdStr)
jozee@3470 10 {
jozee@3470 11 cmdStr = strstr ((const char *) DevIDBuffer+2, "COMMAND SET:");
jozee@3470 12 --- prnt/hpijs/dj3320.cpp.orig 2009-04-29 22:41:07.000000000 +0200
jozee@3470 13 +++ prnt/hpijs/dj3320.cpp 2009-06-02 14:32:21.000000000 +0200
jozee@3470 14 @@ -429,7 +429,7 @@ DISPLAY_STATUS DJ3320::ParseError (BYTE
jozee@3470 15 pLDLEncap->bNewStatus = FALSE;
jozee@3470 16
jozee@3470 17 // First 10 bytes of m_pbyReadBuff are packet header. Status query from printer has $S:
jozee@3470 18 - if ((pcStr = strstr((const char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL)
jozee@3470 19 + if ((pcStr = strstr((char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL)
jozee@3470 20 {
jozee@3470 21 m_dsCurrentStatus = DISPLAY_COMM_PROBLEM;
jozee@3470 22 return DISPLAY_COMM_PROBLEM;