[PVFS2-CVS] commit by slang in pvfs2/src/common/misc: pint-util.c server-config.c state-machine-fns.h

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


Update of /projects/cvsroot/pvfs2/src/common/misc
In directory parlweb:/tmp/cvs-serv8981/src/common/misc

Modified Files:
      Tag: slang-event-changes-branch
	pint-util.c server-config.c state-machine-fns.h 
Log Message:
fixes after branch point shift


Index: pint-util.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/misc/pint-util.c,v
diff -p -u -r1.6.6.1 -r1.6.6.2
--- pint-util.c	25 Aug 2005 20:38:17 -0000	1.6.6.1
+++ pint-util.c	25 Aug 2005 22:14:28 -0000	1.6.6.2
@@ -261,7 +261,7 @@ uint64_t PINT_keyword_to_mask(const PINT
                               size_t length, 
                               const char *value)
 {
-    uint64_t mask = -1;
+    uint64_t mask = 0;
     char *s = NULL, *t = NULL;
     const char *toks = ", ";
     int i = 0, negate = 0;

Index: server-config.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/misc/server-config.c,v
diff -p -u -r1.67.4.2 -r1.67.4.3
--- server-config.c	25 Aug 2005 20:38:18 -0000	1.67.4.2
+++ server-config.c	25 Aug 2005 22:14:28 -0000	1.67.4.3
@@ -48,7 +48,6 @@ static DOTCONF_CB(get_root_handle);
 static DOTCONF_CB(get_name);
 static DOTCONF_CB(get_logfile);
 static DOTCONF_CB(get_event_logging_list);
-static DOTCONF_CB(get_event_log_size);
 static DOTCONF_CB(get_filesystem_collid);
 static DOTCONF_CB(get_alias_list);
 static DOTCONF_CB(get_range_list);
@@ -1027,27 +1026,6 @@ DOTCONF_CB(get_event_logging_list)
     }
     config_s->event_logging = strdup(buf);
     return NULL;
-}
-
-DOTCONF_CB(get_event_log_size)
-{
-    int res;
-    
-    if ((config_s->configuration_context != DEFAULTS_CONFIG) &&
-        (config_s->configuration_context != GLOBAL_CONFIG))
-    {
-        gossip_err("EventLogSize Tag can only be in a "
-                   "Defaults or Global block");
-        return NULL;
-    }
-
-    if(cmd->data.value < 0)
-    {
-        gossip_err("EventLogSize value of %d "
-                   "is not a valid non-negative integer", cmd->data.value);
-        return NULL;
-    }
-    config_s->event_log_size = (ssize_t)cmd->data.value;
 }
 
 DOTCONF_CB(get_flow_module_list)

Index: state-machine-fns.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/misc/state-machine-fns.h,v
diff -p -u -r1.15.6.3 -r1.15.6.4
--- state-machine-fns.h	25 Aug 2005 20:38:18 -0000	1.15.6.3
+++ state-machine-fns.h	25 Aug 2005 22:14:28 -0000	1.15.6.4
@@ -187,7 +187,6 @@ static inline int PINT_state_machine_nex
    Synopsis: This function is used to start a state machines execution.
  */
 
-#ifdef PINT_OP_STATE_TABLE
 static union PINT_state_array_values *PINT_state_machine_locate(struct PINT_OP_STATE *s_op)
 {
     union PINT_state_array_values *current_tmp;



More information about the PVFS2-CVS mailing list