[PVFS2-CVS] commit by slang in pvfs2/src/apps/admin: module.mk.in pvfs2-set-eventmask.c

CVS commit program cvs at parl.clemson.edu
Thu Aug 25 19:14:28 EDT 2005


Update of /projects/cvsroot/pvfs2/src/apps/admin
In directory parlweb:/tmp/cvs-serv8981/src/apps/admin

Modified Files:
      Tag: slang-event-changes-branch
	module.mk.in pvfs2-set-eventmask.c 
Log Message:
fixes after branch point shift


Index: module.mk.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/module.mk.in,v
diff -p -u -r1.32.6.2 -r1.32.6.3
--- module.mk.in	25 Aug 2005 20:38:07 -0000	1.32.6.2
+++ module.mk.in	25 Aug 2005 22:14:28 -0000	1.32.6.3
@@ -20,7 +20,7 @@ ADMINSRC := \
 	$(DIR)/pvfs2-fsck.c\
 	$(DIR)/pvfs2-cp.c \
 	$(DIR)/pvfs2-remove-object.c \
-	$(DIR)/pvfs2-setparam-all.c
+	$(DIR)/pvfs2-setparam-all.c \
 	$(DIR)/pvfs2-touch.c \
 	$(DIR)/pvfs2-ln.c
 

Index: pvfs2-set-eventmask.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-set-eventmask.c,v
diff -p -u -r1.11.6.2 -r1.11.6.3
--- pvfs2-set-eventmask.c	25 Aug 2005 20:38:08 -0000	1.11.6.2
+++ pvfs2-set-eventmask.c	25 Aug 2005 22:14:28 -0000	1.11.6.3
@@ -183,13 +183,6 @@ static struct options* parse_args(int ar
                         tmp_opts->api_mask = PVFS_event_api_keyword_to_mask(
                             optarg);
                     }
-
-                    if(tmp_opts->api_mask < 0)
-                    {
-                        if(tmp_opts->mnt_point) free(tmp_opts->mnt_point);
-                        free(tmp_opts);
-                        return(NULL);
-                    }
                 }
                 fprintf(stderr, "API MASK: 0x%X\n", tmp_opts->api_mask);
                 tmp_opts->api_mask_set = 1;
@@ -211,13 +204,6 @@ static struct options* parse_args(int ar
                     {
                         tmp_opts->op_mask = PVFS_event_op_keyword_to_mask(
                             optarg);
-                    }
-
-                    if(tmp_opts->op_mask < 0)
-                    {
-                        if(tmp_opts->mnt_point) free(tmp_opts->mnt_point);
-                        free(tmp_opts);
-                        return(NULL);
                     }
 		}
                 fprintf(stdout, "OP MASK: 0x%X\n", tmp_opts->op_mask);



More information about the PVFS2-CVS mailing list