components/hplip/patches/02_HPCupsFilter.cpp.patch
author Jiri Sasek <Jiri.Sasek@Oracle.COM>
Wed, 18 Feb 2015 04:51:18 -0800
changeset 3831 33bc4f8fb536
parent 1276 dc3977b83042
child 4923 b9e3f6b6a101
permissions -rw-r--r--
18462148 Update hplip to 3.14.3 or greater.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3831
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
     1
Home brewed patch
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
     2
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
     3
--- a/prnt/hpcups/HPCupsFilter.cpp	2014-04-04 03:39:07.000000000 -0700
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
     4
+++ hplip-3.14.4/prnt/hpcups/HPCupsFilter.cpp	2014-04-11 12:24:59.109386019 -0700
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
     5
@@ -37,6 +37,8 @@
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
     6
 #include <time.h>
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
     7
 #include "utils.h"
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
     8
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
     9
+extern "C" int getdomainname(char*, int);
1276
dc3977b83042 15795105 SUNBT7173056 Update hplip from 3.10.9 to 3.12.4
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents: 165
diff changeset
    10
+
3831
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    11
 #define HP_FILE_VERSION_STR    "03.09.08.0"
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    12
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    13
 static HPCupsFilter    filter;
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    14
@@ -597,7 +599,7 @@
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    15
     char hpPreProcessedRasterFile[MAX_FILE_PATH_LEN]; //temp file needed to store raster data with swaped pages.
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    16
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    17
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    18
-    sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    19
+    snprintf(hpPreProcessedRasterFile, sizeof(hpPreProcessedRasterFile), "%s/hp_%s_cups_SwapedPagesXXXXXX", CUPS_TMP_DIR, m_JA.user_name);
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    20
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    21
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    22
     while (cupsRasterReadHeader2(cups_raster, &cups_header))
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    23
--- a/prnt/hpcups/CommonDefinitions.h	2014-04-04 03:39:07.000000000 -0700
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    24
+++ hplip-3.14.4/prnt/hpcups/CommonDefinitions.h	2014-04-11 12:03:54.025798599 -0700
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    25
@@ -305,7 +305,7 @@
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    26
 /* 0x68 */    ZJI_BITMAP_PIXELS,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    27
 /* 0x69 */    ZJI_BITMAP_LINES,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    28
 /* 0x6A */    ZJI_BITMAP_BPP,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    29
-/* 0x6B */    ZJI_BITMAP_STRIDE,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    30
+/* 0x6B */    ZJI_BITMAP_STRIDE
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    31
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    32
 } ZJ_ITEM;
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    33
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    34
--- a/io/hpmud/hpmud.h	2014-04-04 03:42:17.000000000 -0700
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    35
+++ hplip-3.14.4/io/hpmud/hpmud.h	2014-04-11 12:12:13.756537138 -0700
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    36
@@ -46,7 +46,7 @@
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    37
    HPMUD_R_INVALID_TIMEOUT = 47,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    38
    HPMUD_R_DATFILE_ERROR = 48,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    39
    HPMUD_R_IO_TIMEOUT = 49,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    40
-   HPMUD_R_INVALID_MDNS = 50,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    41
+   HPMUD_R_INVALID_MDNS = 50
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    42
 };
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    43
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    44
 enum HPMUD_IO_MODE
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    45
@@ -57,7 +57,7 @@
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    46
    HPMUD_DOT4_PHOENIX_MODE=4,  /* (ie: clj2550, clj2840, lj3050, lj3055, clj4730mfp) */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    47
    HPMUD_DOT4_BRIDGE_MODE=5,  /* (ie: clj2500) not USB compatable, use HPMUD_RAW_MODE, tested on F10 12/10/08 DES */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    48
    HPMUD_MLC_GUSHER_MODE=6,   /* most new devices */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    49
-   HPMUD_MLC_MISER_MODE=7,  /* old stuff */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    50
+   HPMUD_MLC_MISER_MODE=7  /* old stuff */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    51
 };
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    52
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    53
 enum HPMUD_BUS_ID
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    54
@@ -78,7 +78,7 @@
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    55
    HPMUD_SCANTYPE_SOAPHT = 5,   /* HorseThief (ie: ljm1522) */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    56
    HPMUD_SCANTYPE_SCL_DUPLEX = 6,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    57
    HPMUD_SCANTYPE_LEDM = 7,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    58
-   HPMUD_SCANTYPE_MARVELL2 = 8,     /* (Tsunami lj 1212  and series) */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    59
+   HPMUD_SCANTYPE_MARVELL2 = 8     /* (Tsunami lj 1212  and series) */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    60
 };
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    61
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    62
 enum HPMUD_SCANSRC
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    63
@@ -86,7 +86,7 @@
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    64
    HPMUD_SCANSRC_NA = 0,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    65
    HPMUD_SCANSRC_FLATBED = 0x1,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    66
    HPMUD_SCANSRC_ADF= 0x2,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    67
-   HPMUD_SCANSRC_CAMERA = 0x4,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    68
+   HPMUD_SCANSRC_CAMERA = 0x4
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    69
 };
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    70
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    71
 enum HPMUD_STATUSTYPE
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    72
@@ -97,21 +97,21 @@
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    73
    HPMUD_STATUSTYPE_PML = 3,      /* laserjet pml */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    74
    HPMUD_STATUSTYPE_EWS = 6,      /* laserjet hp ews */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    75
    HPMUD_STATUSTYPE_PJL = 8,      /* laserjet pjl */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    76
-   HPMUD_STATUSTYPE_PJLPML = 9,   /* laserjet pjl and pml */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    77
+   HPMUD_STATUSTYPE_PJLPML = 9    /* laserjet pjl and pml */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    78
 };
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    79
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    80
 enum HPMUD_SUPPORT_TYPE
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    81
 {
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    82
    HPMUD_SUPPORT_TYPE_NONE = 0,   /* not supported */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    83
    HPMUD_SUPPORT_TYPE_HPIJS = 1,  /* supported by hpijs only */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    84
-   HPMUD_SUPPORT_TYPE_HPLIP = 2,   /* supported by hpijs and "hp" backend */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    85
+   HPMUD_SUPPORT_TYPE_HPLIP = 2   /* supported by hpijs and "hp" backend */
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    86
 };
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    87
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    88
 enum HPMUD_PLUGIN_TYPE
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    89
 {
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    90
    HPMUD_PLUGIN_TYPE_NONE = 0,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    91
    HPMUD_PLUGIN_TYPE_REQUIRED = 1,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    92
-   HPMUD_PLUGIN_TYPE_OPTIONAL = 2,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    93
+   HPMUD_PLUGIN_TYPE_OPTIONAL = 2
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    94
 };
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    95
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    96
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    97
--- a/common/utils.h	2014-04-04 03:42:15.000000000 -0700
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    98
+++ hplip-3.14.4/common/utils.h	2014-04-11 12:49:00.832008556 -0700
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
    99
@@ -22,7 +22,8 @@
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   100
 #define SCAN_PLUGIN_SOAPHT "bb_soapht.so"
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   101
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   102
 #define HPLIP_PLUGIN_STATE  "/var/lib/hp/hplip.state"
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   103
-#define CUPS_TMP_DIR   getenv("TMPDIR") ? : getenv("HOME") ?:"/tmp"
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   104
+//#define CUPS_TMP_DIR   getenv("TMPDIR") ? : getenv("HOME") ?:"/tmp"
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   105
+#define CUPS_TMP_DIR   "/tmp"
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   106
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   107
 enum UTILS_CONF_RESULT
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   108
 {
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   109
@@ -30,7 +31,7 @@
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   110
    UTILS_CONF_FILE_NOT_FOUND,       // =1,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   111
    UTILS_CONF_SECTION_NOT_FOUND,    // =2,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   112
    UTILS_CONF_KEY_NOT_FOUND,        // =3,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   113
-   UTILS_CONF_DATFILE_ERROR,        // = 4,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   114
+   UTILS_CONF_DATFILE_ERROR         // = 4,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   115
 };
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   116
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   117
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   118
@@ -38,14 +39,14 @@
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   119
 {
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   120
    UTILS_PLUGIN_STATUS_OK = 0,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   121
    UTILS_PLUGIN_STATUS_MISMATCH,        // = 1,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   122
-   UTILS_PLUGIN_STATUS_NOT_INSTALLED,   // = 2,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   123
+   UTILS_PLUGIN_STATUS_NOT_INSTALLED    // = 2,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   124
 };
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   125
 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   126
 enum UTILS_PLUGIN_LIBRARY_TYPE
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   127
 {
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   128
    UTILS_PRINT_PLUGIN_LIBRARY = 0,          // = 0,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   129
    UTILS_SCAN_PLUGIN_LIBRARY,           // =1,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   130
-   UTILS_FAX_PLUGIN_LIBRARY,            // =2,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   131
+   UTILS_FAX_PLUGIN_LIBRARY//,            // =2,
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   132
 //   UTILS_GENERAL_PLUGIN_LIBRARY         //=4,     // Future use.. 
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   133
 };
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 1276
diff changeset
   134