components/foomatic/filters/patches/pid_t.patch
author Petr Cvachoucek <petr.cvachoucek@oracle.com>
Thu, 05 Apr 2012 08:48:42 -0700
changeset 760 c73130bfdec1
permissions -rw-r--r--
6953366 Update foomatic to v4.0.15 7076448 Problem with print/foomatic
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
760
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     1
This patch fixes the build when SPRO C compiler is used. The original source
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     2
code inconsistently mix "int" and "pid_t" data types.
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     3
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     4
compile error seen:
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     5
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     6
"process.c", line 185: identifier redeclared: start_system_process
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     7
"process.c", line 190: identifier redeclared: start_process
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     8
cc: acomp failed for process.c
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
     9
make[2]: *** [foomatic_rip-process.o] Error 1
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    10
make[1]: *** [all] Error 2
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    11
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    12
--- a/foomaticrip.c	2012-03-14 20:45:28.000000000 +0100
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    13
+++ b/foomaticrip.c	2012-03-19 10:45:27.569249000 +0100
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    14
@@ -981,7 +981,8 @@
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    15
     int startpos;
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    16
     size_t n;
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    17
     FILE *fchandle = NULL;
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    18
-    int fcpid = 0, ret;
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    19
+    pid_t fcpid = 0;
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    20
+    int ret;
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    21
 
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    22
     if (!strcasecmp(filename, "<STDIN>"))
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    23
         file = stdin;
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    24
--- a/process.c	2012-03-14 20:45:28.000000000 +0100
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    25
+++ b/process.c	2012-03-19 10:36:39.639793000 +0100
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    26
@@ -45,7 +45,7 @@
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    27
     { "", -1, 0 }
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    28
 };
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    29
 
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    30
-void add_process(const char *name, int pid, int isgroup)
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    31
+void add_process(const char *name, pid_t pid, int isgroup)
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    32
 {
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    33
     int i;
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    34
     for (i = 0; i < MAX_CHILDS; i++) {
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    35
@@ -59,7 +59,7 @@
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    36
     rip_die(EXIT_PRNERR_NORETRY_BAD_SETTINGS, "Didn't think there would be that many child processes... Exiting.\n");
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    37
 }
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    38
 
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    39
-int find_process(int pid)
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    40
+int find_process(pid_t pid)
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    41
 {
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    42
     int i;
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    43
     for (i = 0; i < MAX_CHILDS; i++)
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    44
@@ -90,7 +90,7 @@
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    45
     clear_proc_list();
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    46
 }
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    47
 
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    48
-static int _start_process(const char *name,
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    49
+static pid_t _start_process(const char *name,
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    50
                           int (*proc_func)(FILE *, FILE *, void *),
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    51
                           void *user_arg, FILE **pipe_in, FILE **pipe_out,
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    52
                           int createprocessgroup)
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    53
@@ -182,17 +182,17 @@
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    54
     return EXIT_PRNERR_NORETRY_BAD_SETTINGS;
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    55
 }
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    56
 
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    57
-int start_system_process(const char *name, const char *command, FILE **fdin, FILE **fdout)
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    58
+pid_t start_system_process(const char *name, const char *command, FILE **fdin, FILE **fdout)
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    59
 {
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    60
     return _start_process(name, exec_command, (void*)command, fdin, fdout, 1);
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    61
 }
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    62
 
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    63
-int start_process(const char *name, int (*proc_func)(FILE *, FILE *, void *), void *user_arg, FILE **fdin, FILE **fdout)
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    64
+pid_t start_process(const char *name, int (*proc_func)(FILE *, FILE *, void *), void *user_arg, FILE **fdin, FILE **fdout)
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    65
 {
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    66
     return _start_process(name, proc_func, user_arg, fdin, fdout, 0);
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    67
 }
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    68
 
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    69
-int wait_for_process(int pid)
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    70
+int wait_for_process(pid_t pid)
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    71
 {
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    72
     int i;
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    73
     int status;
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    74
@@ -216,7 +216,7 @@
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    75
 
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    76
 int run_system_process(const char *name, const char *command)
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    77
 {
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    78
-    int pid = start_system_process(name, command, NULL, NULL);
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    79
+    pid_t pid = start_system_process(name, command, NULL, NULL);
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    80
     return wait_for_process(pid);
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    81
 }
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    82
 
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    83
--- a/process.h	2012-03-14 20:45:28.000000000 +0100
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    84
+++ b/process.h	2012-03-19 10:37:07.577847000 +0100
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    85
@@ -40,7 +40,7 @@
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    86
                           const char *alreadyread,
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    87
                           size_t alreadyread_len);
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    88
 
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    89
-int wait_for_process(int pid);
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    90
+int wait_for_process(pid_t pid);
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    91
 
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    92
 void kill_all_processes();
c73130bfdec1 6953366 Update foomatic to v4.0.15
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset
    93