jfsutils/trunk/jfsutils-1.1.15-gcc10.patch

   1 Submitted By:            Pierre Labastie <pierre dot labastie at neuf dot fr>
   2 Date:                    2020-05-21
   3 Initial Package Version: 1.1.15
   4 Upstream Status:         Unknown (no development since 2011)
   5 Origin:                  self, adapted from opensuse
   6 Description:             Fixes building with GCC 10
   7
   8 --- jfsutils-1.1.15.old/fscklog/display.c       2005-11-22 21:43:54.000000000 +0100
   9 +++ jfsutils-1.1.15.new/fscklog/display.c       2020-05-21 18:15:13.410617620 +0200
  10 @@ -54,7 +54,7 @@
  11   * output: fsck extracted service log I/O buffer
  12   *
  13   */
  14 -char xchklog_buffer[XCHKLOG_BUFSIZE];
  15 +static char xchklog_buffer[XCHKLOG_BUFSIZE];
  16
  17  /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  18   *
  19 diff -ur --exclude '*.o' --exclude '*.a' jfsutils-1.1.15.old/libfs/logredo.c jfsutils-1.1.15.new/libfs/logredo.c
  20 --- jfsutils-1.1.15.old/libfs/logredo.c 2005-11-22 21:43:55.000000000 +0100
  21 +++ jfsutils-1.1.15.new/libfs/logredo.c 2020-05-21 18:19:44.927703271 +0200
  22 @@ -87,9 +87,9 @@
  23   *    S T U F F    F O R    T H E    L O G
  24   *
  25   */
  26 -struct logsuper logsup;                /* log super block */
  27 -int32_t numdoblk;              /* number of do blocks used     */
  28 -int32_t numnodofile;           /* number of nodo file blocks used  */
  29 +static struct logsuper logsup;         /* log super block */
  30 +static int32_t numdoblk;               /* number of do blocks used     */
  31 +static int32_t numnodofile;            /* number of nodo file blocks used  */
  32  int32_t numExtDtPg = 0;                /* number of extended dtpage blocks used  */
  33
  34  /*
  35 @@ -129,7 +129,7 @@
  36   */
  37
  38  /* buffer header table */
  39 -struct bufhdr {
  40 +static struct bufhdr {
  41         int16_t next;           /* 2: next on free/lru list */
  42         int16_t prev;           /* 2: previous on free/lru list */
  43         int16_t hnext;          /* 2: next on hash chain */
  44 @@ -142,7 +142,7 @@
  45  } bufhdr[NBUFPOOL];            /* (24) */
  46
  47  /* buffer table */
  48 -struct bufpool {
  49 +static struct bufpool {
  50         char bytes[PSIZE];
  51  } buffer[NBUFPOOL - 1];
  52
  53 @@ -151,15 +151,16 @@
  54   *
  55   * log has its own 4 page buffer pool.
  56   */
  57 -uint8_t afterdata[LOGPSIZE * 2];       /* buffer to read in redopage data */
  58 +static uint8_t afterdata[LOGPSIZE * 2];        /* buffer to read in redopage data */
  59
  60  /*
  61   * Miscellaneous
  62   */
  63 -caddr_t prog;                  /* Program name */
  64 -int32_t mntcnt, bufsize;
  65 -char *mntinfo;
  66 -int32_t retcode;               /* return code from logredo    */
  67 +static caddr_t prog;                   /* Program name */
  68 +extern int32_t mntcnt;
  69 +static int32_t bufsize;
  70 +static char *mntinfo;
  71 +static int32_t retcode;                /* return code from logredo    */
  72  int end_of_transaction = 0;
  73
  74  /*