[Netatalk-cvs] netatalk/etc/cnid_dbd dbif.c,1.13,1.14

[didier g. <di...@us...>]

Update of /cvsroot/netatalk/netatalk/etc/cnid_dbd
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32628/etc/cnid_dbd

Modified Files:
	dbif.c 
Log Message:
remove pointer of type ‘void *’ used in arithmetic warning

Index: dbif.c
===================================================================
RCS file: /cvsroot/netatalk/netatalk/etc/cnid_dbd/dbif.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** dbif.c	3 Sep 2009 08:35:15 -0000	1.13
--- dbif.c	14 Sep 2009 03:12:11 -0000	1.14
***************
*** 823,828 ****
          /* Rootinfo node ? */
          if (cnid == 0) {
!             memcpy(&stamp, data.data + 4, sizeof(time_t));
!             memcpy(&lastid, data.data + 20, sizeof(cnid_t));
              lastid = ntohl(lastid);
              strftime(timebuf, sizeof(timebuf), "%b %d %Y %H:%M:%S", localtime(&stamp));
--- 823,828 ----
          /* Rootinfo node ? */
          if (cnid == 0) {
!             memcpy(&stamp, (char *)data.data + 4, sizeof(time_t));
!             memcpy(&lastid, (char *)data.data + 20, sizeof(cnid_t));
              lastid = ntohl(lastid);
              strftime(timebuf, sizeof(timebuf), "%b %d %Y %H:%M:%S", localtime(&stamp));
***************
*** 830,843 ****
          } else {
              /* dev */
!             memcpy(&dev, data.data + CNID_DEV_OFS, 8);
              dev = ntoh64(dev);
              /* ino */
!             memcpy(&ino, data.data + CNID_INO_OFS, 8);
              ino = ntoh64(ino);
              /* type */
!             memcpy(&type, data.data + CNID_TYPE_OFS, 4);
              type = ntohl(type);
              /* did */
!             memcpy(&did, data.data + CNID_DID_OFS, 4);
              did = ntohl(did);
  
--- 830,843 ----
          } else {
              /* dev */
!             memcpy(&dev, (char *)data.data + CNID_DEV_OFS, 8);
              dev = ntoh64(dev);
              /* ino */
!             memcpy(&ino, (char *)data.data + CNID_INO_OFS, 8);
              ino = ntoh64(ino);
              /* type */
!             memcpy(&type, (char *)data.data + CNID_TYPE_OFS, 4);
              type = ntohl(type);
              /* did */
!             memcpy(&did, (char *)data.data + CNID_DID_OFS, 4);
              did = ntohl(did);
  
***************
*** 891,895 ****
                  dev = ntoh64(dev);
                  /* ino */
!                 memcpy(&ino, key.data + CNID_DEV_LEN, CNID_INO_LEN);
                  ino = ntoh64(ino);
                  
--- 891,895 ----
                  dev = ntoh64(dev);
                  /* ino */
!                 memcpy(&ino, (char *)key.data + CNID_DEV_LEN, CNID_INO_LEN);
                  ino = ntoh64(ino);