Home Explore Help
Sign In
erkanisik
/
main
mirror of https://github.com/pisilinux/main.git
Watch 1
Star 0
Fork 0
Files Issues 0 Wiki
Tree: 6e47aa2ff8
Branches Tags
main
/
hardware
/
printer
/
hplip
/
files
/
fedora
/
hplip-strstr-const.patch

hplip-strstr-const.patch 2.3 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051 
  1. diff -up hplip-3.9.6b/prnt/hpijs/dj3320.cpp.strstr-const hplip-3.9.6b/prnt/hpijs/dj3320.cpp
    2. 

  2. --- hplip-3.9.6b/prnt/hpijs/dj3320.cpp.strstr-const	2009-06-25 21:02:29.000000000 +0100
    3. 

  3. +++ hplip-3.9.6b/prnt/hpijs/dj3320.cpp	2009-07-27 16:14:52.868542337 +0100
    4. 

  4. @@ -405,7 +405,7 @@ DISPLAY_STATUS DJ3320::ParseError (BYTE 
    5. 

  5.  {
    6. 

  6.      DRIVER_ERROR err = NO_ERROR;
    7. 

  7.      BYTE byDevIDBuffer[DevIDBuffSize];
    8. 

  8. -    char *pcStr = NULL;
    9. 

  9. +    const char *pcStr = NULL;
    10. 

  10.      BYTE byStatus1, byStatus2;
    11. 

  11.  
    12. 

  12.      memset(byDevIDBuffer, 0, sizeof(byDevIDBuffer));
    13. 

  13. diff -up hplip-3.9.6b/prnt/hpijs/registry.cpp.strstr-const hplip-3.9.6b/prnt/hpijs/registry.cpp
    14. 

  14. --- hplip-3.9.6b/prnt/hpijs/registry.cpp.strstr-const	2009-06-25 21:02:29.000000000 +0100
    15. 

  15. +++ hplip-3.9.6b/prnt/hpijs/registry.cpp	2009-07-27 16:18:41.583417187 +0100
    16. 

  16. @@ -290,14 +290,14 @@ DRIVER_ERROR DeviceRegistry::SelectDevic
    17. 

  17.          err = pSS->GetDeviceID(DevIDBuffer, DevIDBuffSize, FALSE);
    18. 

  18.          ERRCHECK;   // should be either NO_ERROR or BAD_DEVICE_ID
    19. 

  19.  
    20. 

  20. -		char	*cmdStr = (char *) strstr ((const char *) DevIDBuffer+2, "CMD:");
    21. 

  21. +	char	*cmdStr = strstr ((char *) DevIDBuffer+2, "CMD:");
    22. 

  22.          char    *cmdStrEnd;
    23. 

  23.          if ((strstr((const char *) DevIDBuffer+2,"CMD:LDL")))
    24. 

  24.          {
    25. 

  25.              device = eDJ3320;
    26. 

  26.              match = TRUE;
    27. 

  27.          }
    28. 

  28. -        if (!match && cmdStr && (cmdStrEnd = (char *) strstr (cmdStr, ";")))
    29. 

  29. +        if (!match && cmdStr && (cmdStrEnd = strstr (cmdStr, ";")))
    30. 

  30.          {
    31. 

  31.              *cmdStrEnd = '\0';
    32. 

  32.              if (strstr (cmdStr, "LDL"))
    33. 

  33. @@ -309,12 +309,12 @@ DRIVER_ERROR DeviceRegistry::SelectDevic
    34. 

  34.          }
    35. 

  35.  		if (!match && !cmdStr)
    36. 

  36.  		{
    37. 

  37. -			cmdStr = (char *) strstr ((const char *) DevIDBuffer+2, "COMMAND SET:");
    38. 

  38. +			cmdStr = strstr ((char *) DevIDBuffer+2, "COMMAND SET:");
    39. 

  39.  		}
    40. 

  40. -		if (!match && cmdStr && (strstr ((const char *) cmdStr+4, "POSTSCRIPT") || 
    41. 

  41. -			                     strstr ((const char *) cmdStr+4, "PostScript") || 
    42. 

  42. -					             strstr ((const char *) cmdStr+4, "Postscript") || 
    43. 

  43. -					             strstr ((const char *) cmdStr+4, "postscript") ))
    44. 

  44. +		if (!match && cmdStr && (strstr (cmdStr+4, "POSTSCRIPT") || 
    45. 

  45. +			                     strstr (cmdStr+4, "PostScript") || 
    46. 

  46. +					             strstr (cmdStr+4, "Postscript") || 
    47. 

  47. +					             strstr (cmdStr+4, "postscript") ))
    48. 

  48.  		{
    49. 

  49.  			device = ePScript;
    50. 

  50.  			match = TRUE;
    51. 

  51.