[Pvfs2-cvs] commit by vilayann in pvfs2-1/src/io/trove/trove-dbpf: dbpf-keyval-pcache.c dbpf-keyval-pcache.h dbpf-keyval.c

CVS commit program cvs at parl.clemson.edu
Tue Aug 15 21:23:19 EDT 2006


Update of /projects/cvsroot/pvfs2-1/src/io/trove/trove-dbpf
In directory parlweb1:/tmp/cvs-serv18673/src/io/trove/trove-dbpf

Modified Files:
	dbpf-keyval-pcache.c dbpf-keyval-pcache.h dbpf-keyval.c 
Log Message:
Fixed a few of the gcc 4.1.x "dereferencing type-punned pointer will break strict-aliasing rules"
warnings 




Index: dbpf-keyval-pcache.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/io/trove/trove-dbpf/dbpf-keyval-pcache.c,v
diff -p -u -r1.4 -r1.5
--- dbpf-keyval-pcache.c	13 Jun 2006 15:56:52 -0000	1.4
+++ dbpf-keyval-pcache.c	16 Aug 2006 01:23:19 -0000	1.5
@@ -136,7 +136,7 @@ int PINT_dbpf_keyval_pcache_lookup(
     PINT_dbpf_keyval_pcache *pcache,
     TROVE_handle handle,
     TROVE_ds_position pos,
-    const char ** keyname,
+    const void ** keyname,
     int * length)
 {
     struct PINT_tcache_entry *entry;
@@ -176,7 +176,7 @@ int PINT_dbpf_keyval_pcache_lookup(
     gossip_debug(GOSSIP_DBPF_KEYVAL_DEBUG,
                  "Trove KeyVal pcache lookup succeeded: "
                  "handle: %llu, pos: %d, key: %*s\n",
-                 llu(handle), pos, *length, *keyname);
+                 llu(handle), pos, *length, (char *) *keyname);
 
     return 0;
 }

Index: dbpf-keyval-pcache.h
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/io/trove/trove-dbpf/dbpf-keyval-pcache.h,v
diff -p -u -r1.2 -r1.3
--- dbpf-keyval-pcache.h	4 Apr 2006 04:47:12 -0000	1.2
+++ dbpf-keyval-pcache.h	16 Aug 2006 01:23:19 -0000	1.3
@@ -28,7 +28,7 @@ int PINT_dbpf_keyval_pcache_lookup(
     PINT_dbpf_keyval_pcache *pcache,
     TROVE_handle handle,
     TROVE_ds_position pos,
-    const char ** keyname,
+    const void ** keyname,
     int * length);
 
 int PINT_dbpf_keyval_pcache_insert( 

Index: dbpf-keyval.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/io/trove/trove-dbpf/dbpf-keyval.c,v
diff -p -u -r1.74 -r1.75
--- dbpf-keyval.c	13 Jul 2006 05:11:41 -0000	1.74
+++ dbpf-keyval.c	16 Aug 2006 01:23:19 -0000	1.75
@@ -1427,7 +1427,7 @@ static int dbpf_keyval_iterate_skip_to_p
 
     ret = PINT_dbpf_keyval_pcache_lookup(
         pcache, handle, pos, 
-        (const char **)&key.buffer, &key.buffer_sz);
+        (const void **)&key.buffer, &key.buffer_sz);
     if(ret == -PVFS_ENOENT)
     {
         /* if the lookup fails (because the server was restarted)



More information about the Pvfs2-cvs mailing list