]>
Commit | Line | Data |
---|---|---|
5176f671 AM |
1 | --- hplip-2.8.10/prnt/hpijs/registry.cpp~ 2008-10-31 23:27:44.000000000 +0100 |
2 | +++ hplip-2.8.10/prnt/hpijs/registry.cpp 2009-07-15 09:05:58.048526893 +0200 | |
3 | @@ -285,10 +285,10 @@ | |
4 | device = eDJ3320; | |
5 | match = TRUE; | |
6 | } | |
7 | - char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:"); | |
8 | + char *cmdStr = (char *)strstr ((const char *) DevIDBuffer+2, "CMD:"); | |
9 | if (!cmdStr) | |
10 | { | |
11 | - cmdStr = strstr ((const char *) DevIDBuffer+2, "COMMAND SET:"); | |
12 | + cmdStr = (char *)strstr ((const char *) DevIDBuffer+2, "COMMAND SET:"); | |
13 | } | |
14 | if (!match && cmdStr && (strstr ((const char *) cmdStr+4, "POSTSCRIPT") || | |
15 | strstr ((const char *) cmdStr+4, "PostScript") || | |
16 | --- hplip-2.8.10/prnt/hpijs/dj3320.cpp~ 2008-10-31 23:27:44.000000000 +0100 | |
17 | +++ hplip-2.8.10/prnt/hpijs/dj3320.cpp 2009-07-15 09:07:37.832654493 +0200 | |
18 | @@ -429,7 +429,7 @@ | |
19 | pLDLEncap->bNewStatus = FALSE; | |
20 | ||
21 | // First 10 bytes of m_pbyReadBuff are packet header. Status query from printer has $S: | |
22 | - if ((pcStr = strstr((const char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL) | |
23 | + if ((pcStr = (char *)strstr((const char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL) | |
24 | { | |
25 | m_dsCurrentStatus = DISPLAY_COMM_PROBLEM; | |
26 | return DISPLAY_COMM_PROBLEM; |