logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0003-Remove-pointer-arithmetic-on-void.patch (6124B)

    

  1. From fa651ab426b8c6be7398799ebab26e87918cc5f1 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Thu, 21 Feb 2019 23:28:17 -0800
  4. Subject: [PATCH] Remove pointer arithmetic on void *
  6. ---
  7.  lasagna/cdb/cdb_dynread.c     |  2 +-
  8.  lasagna/dynbuf/dynbuf_pack.c  |  2 +-
  9.  lasagna/dynbuf/dynbuf_put.c   |  5 +++--
  10.  lasagna/hdb/hdb_dynread.c     |  2 +-
  11.  lasagna/ioq/ioq_put.c         | 10 +++++-----
  12.  lasagna/packet/packet_write.c |  5 +++--
  13.  perp/tinylog.c                |  4 ++--
  14.  runtools/runchoom.c           |  4 ++--
  15.  8 files changed, 18 insertions(+), 16 deletions(-)
  17. diff --git a/lasagna/cdb/cdb_dynread.c b/lasagna/cdb/cdb_dynread.c
  18. index b7135c5..f5e7ab8 100644
  19. --- a/lasagna/cdb/cdb_dynread.c
  20. +++ b/lasagna/cdb/cdb_dynread.c
  21. @@ -23,7 +23,7 @@ cdb_dynread(struct cdb *C, struct dynbuf *B, size_t len, uint32_t offset)
  22.    if(dynbuf_grow(B, len) == -1)
  23.        return -1;
  24.  
  25. -  if(cdb_read(C, dynbuf_BUF(B) + dynbuf_LEN(B), len, offset) == -1)
  26. +  if(cdb_read(C, (uchar_t *)dynbuf_BUF(B) + dynbuf_LEN(B), len, offset) == -1)
  27.        return -1;
  28.  
  29.    dynbuf_LEN(B) += len;
  30. diff --git a/lasagna/dynbuf/dynbuf_pack.c b/lasagna/dynbuf/dynbuf_pack.c
  31. index 84727cb..4543a0a 100644
  32. --- a/lasagna/dynbuf/dynbuf_pack.c
  33. +++ b/lasagna/dynbuf/dynbuf_pack.c
  34. @@ -46,7 +46,7 @@ dynbuf_pack(struct dynbuf *D, const char *fmt, ...)
  35.    }
  36.  
  37.    /* with need satisfied, append directly into buf: */
  38. -  b = (D->buf + D->p);
  39. +  b = (uchar_t *)D->buf + D->p;
  40.  
  41.    va_start(args, fmt);
  42.    w = upak_vpack(b, fmt, args);
  43. diff --git a/lasagna/dynbuf/dynbuf_put.c b/lasagna/dynbuf/dynbuf_put.c
  44. index 6ff7bdb..46989c4 100644
  45. --- a/lasagna/dynbuf/dynbuf_put.c
  46. +++ b/lasagna/dynbuf/dynbuf_put.c
  47. @@ -19,10 +19,11 @@ dynbuf_putbuf(struct dynbuf *d, const void *buf, size_t len)
  48.      if(dynbuf_grow(d, (len + 1)) != 0)
  49.          return -1;  /* error! */
  50.  
  51. -    buf_copy((d->buf + d->p), buf, len);
  52. +    b = d->buf;
  53. +    buf_copy(b + d->p, buf, len);
  54.  
  55.      d->p += len;
  56. -    b = d->buf; b[d->p] = 'Q'; /* "offensive programming" */
  57. +    b[d->p] = 'Q'; /* "offensive programming" */
  58.  
  59.      return 0; /* no error */
  60.  }
  61. diff --git a/lasagna/hdb/hdb_dynread.c b/lasagna/hdb/hdb_dynread.c
  62. index cd818bc..82d20d2 100644
  63. --- a/lasagna/hdb/hdb_dynread.c
  64. +++ b/lasagna/hdb/hdb_dynread.c
  65. @@ -23,7 +23,7 @@ hdb_dynread(struct hdb *H, struct dynbuf *B, size_t len, uint32_t offset)
  66.    if(dynbuf_grow(B, len) == -1)
  67.        return -1;
  68.  
  69. -  if(hdb_read(H, dynbuf_BUF(B) + dynbuf_LEN(B), len, offset) == -1)
  70. +  if(hdb_read(H, (uchar_t *)dynbuf_BUF(B) + dynbuf_LEN(B), len, offset) == -1)
  71.        return -1;
  72.  
  73.    dynbuf_LEN(B) += len;
  74. diff --git a/lasagna/ioq/ioq_put.c b/lasagna/ioq/ioq_put.c
  75. index 47f4897..20737a6 100644
  76. --- a/lasagna/ioq/ioq_put.c
  77. +++ b/lasagna/ioq/ioq_put.c
  78. @@ -44,7 +44,7 @@
  79.  
  80.  
  81.  /* internal declarations: */
  82. -static int write_all(int fd, void *buf, size_t to_write, ssize_t (*op)());
  83. +static int write_all(int fd, uchar_t *buf, size_t to_write, ssize_t (*op)());
  84.  
  85.  
  86.  /*
  87. @@ -63,13 +63,13 @@ static int write_all(int fd, void *buf, size_t to_write, ssize_t (*op)());
  88.  */      
  89.  static
  90.  int
  91. -write_all(int fd, void *buf, size_t to_write, ssize_t (*op)())
  92. +write_all(int fd, uchar_t *buf, size_t to_write, ssize_t (*op)())
  93.  {
  94.    ssize_t  w = 0;
  95.  
  96.    while(to_write){
  97.        do{
  98. -          w =  op(fd, buf, to_write);
  99. +          w =  op(fd, (void *)buf, to_write);
  100.        }while((w == -1) && (errno == EINTR));
  101.  
  102.        if(w == -1)  return -1;  /* error! */
  103. @@ -137,7 +137,7 @@ ioq_put(ioq_t *ioq, const uchar_t *data, size_t len)
  104.        while(len > ioq->n){
  105.            /* don't write more than len! */
  106.            if(len < n) n = len;
  107. -          if(write_all(ioq->fd, (void *)data, n, ioq->op) == -1){
  108. +          if(write_all(ioq->fd, (uchar_t *)data, n, ioq->op) == -1){
  109.                /* write() error: */
  110.                return -1;
  111.            }
  112. @@ -178,7 +178,7 @@ ioq_putflush(ioq_t *ioq, const uchar_t *data, size_t len)
  113.    if(ioq_flush(ioq) == -1) return -1;
  114.  
  115.    /* write() the rest */
  116. -  return write_all(ioq->fd, (void *)data, len, ioq->op);
  117. +  return write_all(ioq->fd, (uchar_t *)data, len, ioq->op);
  118.  }
  119.  
  120.  
  121. diff --git a/lasagna/packet/packet_write.c b/lasagna/packet/packet_write.c
  122. index 66c5f8c..6af6a94 100644
  123. --- a/lasagna/packet/packet_write.c
  124. +++ b/lasagna/packet/packet_write.c
  125. @@ -50,11 +50,12 @@ packet_write(int fd, const void *packet, size_t n)
  126.  {
  127.     ssize_t  w = 0;
  128.     size_t   to_write = n;
  129. +   const char *b = packet;
  130.  
  131.     while(to_write > 0){
  132.  
  133.         do{
  134. -           w = write(fd, packet, to_write);
  135. +           w = write(fd, b, to_write);
  136.         }while((w == -1) && (errno == EINTR));
  137.  
  138.         if(w == -1)
  139. @@ -63,7 +64,7 @@ packet_write(int fd, const void *packet, size_t n)
  140.         if(w == 0)
  141.             continue;
  142.  
  143. -       packet += w;
  144. +       b += w;
  145.         to_write -= w;
  146.     }
  147.  
  148. diff --git a/perp/tinylog.c b/perp/tinylog.c
  149. index 8df6283..a593a66 100644
  150. --- a/perp/tinylog.c
  151. +++ b/perp/tinylog.c
  152. @@ -124,7 +124,7 @@ const char *gzip_path = NULL;
  153.  /*
  154.  ** declarations in scope:
  155.  */
  156. -static void  write_all(int fd, void *buf, size_t len);
  157. +static void  write_all(int fd, char *buf, size_t len);
  158.  static void stamp8601_make(char *stamp_buf);
  159.  static void init_logdir(struct tinylog *tinylog);
  160.  static void init_current(struct tinylog *tinylog, int resume);
  161. @@ -182,7 +182,7 @@ ssize_t read_op(int fd, void *buf, size_t len)
  162.  */
  163.  static
  164.  void
  165. -write_all(int fd, void *buf, size_t len)
  166. +write_all(int fd, char *buf, size_t len)
  167.  {
  168.    ssize_t w = 0;
  169.    tain_t  epause = tain_INIT(0, EPAUSE);
  170. diff --git a/runtools/runchoom.c b/runtools/runchoom.c
  171. index e318e2a..0682ad3 100644
  172. --- a/runtools/runchoom.c
  173. +++ b/runtools/runchoom.c
  174. @@ -59,7 +59,7 @@ static char  setbuf[256];
  175.  static char  pidfmt[NFMT_SIZE];
  176.  
  177.  /* functions in scope: */
  178. -static int write_all(int fd, void *buf, size_t to_write);
  179. +static int write_all(int fd, char *buf, size_t to_write);
  180.  static void do_choom(void);
  181.  
  182.  /* syserr_warn() macro: */
  183. @@ -77,7 +77,7 @@ static void do_choom(void);
  184.  
  185.  static
  186.  int
  187. -write_all(int fd, void *buf, size_t to_write)
  188. +write_all(int fd, char *buf, size_t to_write)
  189.  {
  190.    ssize_t  w = 0;
  191.  
  192. -- 
  193. 2.20.1