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