[Pkg-gnupg-commit] [gnupg2] 109/118: tests/gpgscm: Fix use of pointer.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch encoding-and-speling
in repository gnupg2.

commit 68eb5fbd37c31ed7c0c916656131eea7bb58d13d
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Sep 15 09:17:59 2016 +0900

    tests/gpgscm: Fix use of pointer.
    
    * tests/gpgscm/scheme-private.h (struct scheme): Use (void *) for
    alloc_seg.
    * tests/gpgscm/scheme.c (alloc_cellseg): Use (void *) for cp.  Use
    (void *) for coercion of address calculation.
    
    --
    
    In old C language, (char *) means an address.  In modern C, it's
    specifically an address with alignment=1.  It's good to use (void *) for
    an address, because newer compiler emits warnings.  Note: in this
    particular case, it is just a warning and the code is safe against
    invalid alignment, though.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
 tests/gpgscm/scheme-private.h | 2 +-
 tests/gpgscm/scheme.c         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/gpgscm/scheme-private.h b/tests/gpgscm/scheme-private.h
index 9eafe76..727e0c0 100644
--- a/tests/gpgscm/scheme-private.h
+++ b/tests/gpgscm/scheme-private.h
@@ -78,7 +78,7 @@ int tracing;
 #ifndef CELL_NSEGMENT
 #define CELL_NSEGMENT   10    /* # of segments for cells */
 #endif
-char *alloc_seg[CELL_NSEGMENT];
+void *alloc_seg[CELL_NSEGMENT];
 pointer cell_seg[CELL_NSEGMENT];
 int     last_cell_seg;
 
diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index 1fc7643..8833950 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -602,7 +602,7 @@ static int alloc_cellseg(scheme *sc, int n) {
      pointer newp;
      pointer last;
      pointer p;
-     char *cp;
+     void *cp;
      long i;
      int k;
      int adj=ADJ;
@@ -614,14 +614,14 @@ static int alloc_cellseg(scheme *sc, int n) {
      for (k = 0; k < n; k++) {
          if (sc->last_cell_seg >= CELL_NSEGMENT - 1)
               return k;
-         cp = (char*) sc->malloc(CELL_SEGSIZE * sizeof(struct cell)+adj);
+         cp = sc->malloc(CELL_SEGSIZE * sizeof(struct cell)+adj);
          if (cp == 0)
               return k;
          i = ++sc->last_cell_seg ;
          sc->alloc_seg[i] = cp;
          /* adjust in TYPE_BITS-bit boundary */
          if(((unsigned long)cp)%adj!=0) {
-           cp=(char*)(adj*((unsigned long)cp/adj+1));
+           cp=(void *)(adj*((unsigned long)cp/adj+1));
          }
          /* insert new segment in address order */
          newp=(pointer)cp;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git