[gs-commits] ghostpdl branch, master, updated. jbig2dec-0.14-2044-g59ed026

[email protected] (Robin Watts) Fri, 3 Jan 2020 15:55:39 +0000 (UTC)
Newsgroups gmane.comp.printing.ghostscript.cvs
Message-ID <[email protected]>
The ghostpdl branch, master has been updated
       via  59ed026565b5be1bd055d0fbd1b066b8c07274e0 (commit)
      from  d7d012bfe6c8f248db8b8474743618c53318ce40 (commit)

----------------------------------------------------------------------
commit 59ed026565b5be1bd055d0fbd1b066b8c07274e0
Author: Robin Watts <[email protected]>
Date:   Fri Jan 3 15:52:41 2020 +0000

    Squash warnings (dropped from earlier commit).
    
    These warnings were supposed to have been squashed a few
    commits ago, but somehow got lost in a rebase. Thus they
    were mentioned in the commit message, but didn't make it
    in.
    
    Avoid problems with 'errno' being a special thing that
    shouldn't be used as a parameter name.
    
    Explicitly cast time_t to long for printing.

diff --git a/base/gsioram.c b/base/gsioram.c
index c0199b7..e21e320 100644
--- a/base/gsioram.c
+++ b/base/gsioram.c
@@ -113,8 +113,8 @@ static int
 s_ram_switch(stream *, bool);
 
 static int
-ramfs_errno_to_code(int errno) {
-    switch (errno) {
+ramfs_errno_to_code(int error_number) {
+    switch (error_number) {
     case RAMFS_NOTFOUND:
         return_error(gs_error_undefinedfilename);
     case RAMFS_NOACCESS:
diff --git a/base/mkromfs.c b/base/mkromfs.c
index e427778..54e33f2 100644
--- a/base/mkromfs.c
+++ b/base/mkromfs.c
@@ -2526,7 +2526,7 @@ main(int argc, char *argv[])
     }
     if (!buildtime)
         buildtime = time(NULL);
-    fprintf(out,"    time_t gs_romfs_buildtime = %ld;\n\n", buildtime);
+    fprintf(out,"    time_t gs_romfs_buildtime = %ld;\n\n", (long)buildtime);
 
     /* process the remaining arguments (options interspersed with paths) */
     for (; atarg < argc; atarg++) {
diff --git a/base/pack_ps.c b/base/pack_ps.c
index 1bd8edc..764ae3b 100644
--- a/base/pack_ps.c
+++ b/base/pack_ps.c
@@ -344,7 +344,7 @@ main(int argc, char *argv[])
     if (!buildtime) {
         buildtime = time(NULL);
     }
-    fprintf(outfile,"/* Auto-generated from PostScript file \"%s\" at time %ld */\n", infilename, buildtime);
+    fprintf(outfile,"/* Auto-generated from PostScript file \"%s\" at time %ld */\n", infilename, (long)buildtime);
 
     while (readline(infile, inputline, INPUT_LINE_LENGTH_MAX)) {
 


Summary of changes:
 base/gsioram.c | 4 ++--
 base/mkromfs.c | 2 +-
 base/pack_ps.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)