[Pvfs2-cvs] commit by nlmills in pvfs2/src/io/trove: trove-migrate.c

CVS commit program cvs at parl.clemson.edu
Thu Jan 13 15:11:46 EST 2011


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

Modified Files:
      Tag: cu-security-branch
	trove-migrate.c 
Log Message:
merge with Orange-Branch


Index: trove-migrate.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/trove/trove-migrate.c,v
diff -p -u -r1.4.28.4 -r1.4.28.5
--- trove-migrate.c	4 Oct 2010 20:42:45 -0000	1.4.28.4
+++ trove-migrate.c	13 Jan 2011 20:11:46 -0000	1.4.28.5
@@ -272,7 +272,7 @@ int trove_migrate (TROVE_method_id metho
     TROVE_ds_position pos;
     TROVE_coll_id     coll_id;
     TROVE_op_id       op_id;
-    TROVE_keyval_s    name;
+    TROVE_keyval_s    name = {0};
     struct migration_s *migrate_p;
     int               count;
     int               ret = 0;
@@ -286,7 +286,7 @@ int trove_migrate (TROVE_method_id metho
     s = wtime();
 #endif
 
-    count          = 10;
+    count          = 1;
     pos            = TROVE_ITERATE_START;
     name.buffer    = malloc(PATH_MAX);
     name.buffer_sz = PATH_MAX;
@@ -297,6 +297,7 @@ int trove_migrate (TROVE_method_id metho
         gossip_err("malloc failed: errno=%d\n", errno);
         goto complete;
     }
+    memset(name.buffer,0,PATH_MAX);
 
     while (count > 0)
     {



More information about the Pvfs2-cvs mailing list