[Pvfs2-cvs] commit by mtmoore in pvfs2/src/server: list-eattr.sm pvfs2-server.c

CVS commit program cvs at parl.clemson.edu
Wed Jun 8 08:13:28 EDT 2011


Update of /projects/cvsroot/pvfs2/src/server
In directory parlweb1:/tmp/cvs-serv22373/server

Modified Files:
      Tag: Orange-Branch
	list-eattr.sm pvfs2-server.c 
Log Message:
compiler warning cleanup


Index: list-eattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/list-eattr.sm,v
diff -p -u -r1.14.10.1 -r1.14.10.2
--- list-eattr.sm	25 Feb 2011 22:20:48 -0000	1.14.10.1
+++ list-eattr.sm	8 Jun 2011 12:13:28 -0000	1.14.10.2
@@ -101,7 +101,8 @@ static PINT_sm_action listeattr_setup_re
         {
              gossip_debug(GOSSIP_LISTEATTR_DEBUG, "%s: requested key %d "
                           "size of %ld is greater than maximum of %d\n",
-                          __func__, i, (int64_t)s_op->req->u.listeattr.keysz[i],
+                          __func__, i, 
+                          ((long int)s_op->req->u.listeattr.keysz[i]),
                           PVFS_MAX_XATTR_NAMELEN );
             js_p->error_code = -PVFS_EINVAL;
             return SM_ACTION_COMPLETE;

Index: pvfs2-server.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/pvfs2-server.c,v
diff -p -u -r1.269.4.17 -r1.269.4.18
--- pvfs2-server.c	8 Jun 2011 01:08:11 -0000	1.269.4.17
+++ pvfs2-server.c	8 Jun 2011 12:13:28 -0000	1.269.4.18
@@ -1801,7 +1801,7 @@ static int server_parse_cmd_line_args(in
 
     if (argv[optind][0] != '/')
     {
-        if( getcwd(startup_cwd, PATH_MAX) < 0 )
+        if( (startup_cwd = getcwd(startup_cwd, PATH_MAX)) == NULL )
         {
             gossip_err("Failed to get current working directory to create "
                        "absolute path for configuration file: %s\n",
@@ -2455,7 +2455,8 @@ static int precreate_pool_initialize(int
 
                     gossip_debug(GOSSIP_SERVER_DEBUG, "%s: setting up pool on "
                                  "%s, type: %u, fs_id: %llu, handle: %llu\n",
-                                 __func__, host, t, llu(cur_fs->coll_id), 
+                                 __func__, host, t, 
+                                 llu(cur_fs->coll_id), 
                                  llu(pool_handle));
                     ret = precreate_pool_setup_server(host, t, 
                         cur_fs->coll_id, &pool_handle);



More information about the Pvfs2-cvs mailing list