o fix generation of libslurm.sym in src/api/Makefile.am

 o change make_time_str to slurm_make_time_str in libslurm for
   consistency and safety.
 o update references to make_time_str to slurm_make_time_str

src/api/Makefile.am

@@ -52,7 +52,7 @@ libslurm_la_DEPENDENCIES   = libslurm.sym $(common_dir)/libcommon.la
 
 
 libslurm.sym : $(top_builddir)/slurm/slurm.h 
-	sed -n 's/^extern.* \(slurm[^ ]*\).*$$/\1/p' $< >libslurm.sym
+	sed -n 's/^extern.* \(slurm[a-zA-Z0-9_]*\).*$$/\1/p' $< >libslurm.sym
 
 distclean-local: 
 	-rm libslurm.sym

src/api/config_info.c

@@ -50,7 +50,8 @@ void slurm_print_ctl_conf ( FILE* out,
 	if ( slurm_ctl_conf_ptr == NULL )
 		return ;
 
-	make_time_str ((time_t *)&slurm_ctl_conf_ptr->last_update, time_str);
+	slurm_make_time_str ((time_t *)&slurm_ctl_conf_ptr->last_update, 
+			     time_str);
 	fprintf(out, "Configuration data as of %s\n", time_str);
 	fprintf(out, "AuthType          = %s\n", 
 		slurm_ctl_conf_ptr->authtype);

src/api/job_info.c

@@ -56,7 +56,7 @@ slurm_print_job_info_msg ( FILE* out, job_info_msg_t *jinfo, int one_liner )
 	job_info_t *job_ptr = jinfo->job_array;
 	char time_str[16];
 
-	make_time_str ((time_t *)&jinfo->last_update, time_str);
+	slurm_make_time_str ((time_t *)&jinfo->last_update, time_str);
 	fprintf( out, "Job data as of %s, record count %d\n",
 		 time_str, jinfo->record_count);
 
@@ -130,13 +130,13 @@ slurm_print_job_info ( FILE* out, job_info_t * job_ptr, int one_liner )
 		fprintf ( out, "\n   ");
 
 	/****** Line 5 ******/
-	make_time_str ((time_t *)&job_ptr->start_time, time_str);
+	slurm_make_time_str ((time_t *)&job_ptr->start_time, time_str);
 	fprintf ( out, "StartTime=%s EndTime=", time_str);
 	if ((job_ptr->time_limit == INFINITE) && 
 	    (job_ptr->end_time > time(NULL)))
 		fprintf ( out, "NONE");
 	else {
-		make_time_str ((time_t *)&job_ptr->end_time, time_str);
+		slurm_make_time_str ((time_t *)&job_ptr->end_time, time_str);
 		fprintf ( out, "%s", time_str);
 	}
 	if (one_liner)
@@ -216,7 +216,7 @@ slurm_print_job_info ( FILE* out, job_info_t * job_ptr, int one_liner )
  * OUT string - pointer user defined buffer
  */
 extern void
-make_time_str (time_t *time, char *string)
+slurm_make_time_str (time_t *time, char *string)
 {
 	struct tm time_tm;
 

src/api/job_step_info.c

@@ -54,7 +54,7 @@ slurm_print_job_step_info_msg ( FILE* out,
 	job_step_info_t *job_step_ptr = job_step_info_msg_ptr->job_steps ;
 	char time_str[16];
 
-	make_time_str ((time_t *)&job_step_info_msg_ptr->last_update, 
+	slurm_make_time_str ((time_t *)&job_step_info_msg_ptr->last_update, 
 			time_str);
 	fprintf( out, "Job step data as of %s, record count %d\n",
 		time_str, job_step_info_msg_ptr->job_step_count);
@@ -80,7 +80,7 @@ slurm_print_job_step_info ( FILE* out, job_step_info_t * job_step_ptr,
 	char time_str[16];
 
 	/****** Line 1 ******/
-	make_time_str ((time_t *)&job_step_ptr->start_time, time_str);
+	slurm_make_time_str ((time_t *)&job_step_ptr->start_time, time_str);
 	fprintf ( out, "StepId=%u.%u UserId=%u Tasks=%u StartTime=%s", 
 		job_step_ptr->job_id, job_step_ptr->step_id, 
 		job_step_ptr->user_id, job_step_ptr->num_tasks, time_str);

src/api/node_info.c

@@ -57,7 +57,8 @@ slurm_print_node_info_msg ( FILE * out, node_info_msg_t * node_info_msg_ptr,
 	node_info_t * node_ptr = node_info_msg_ptr -> node_array ;
 	char time_str[16];
 
-	make_time_str ((time_t *)&node_info_msg_ptr->last_update, time_str);
+	slurm_make_time_str ((time_t *)&node_info_msg_ptr->last_update, 
+			     time_str);
 	fprintf( out, "Node data as of %s, record count %d\n",
 		time_str, node_info_msg_ptr->record_count);
 

src/api/partition_info.c

@@ -51,7 +51,7 @@ void slurm_print_partition_info_msg ( FILE* out,
 	partition_info_t * part_ptr = part_info_ptr->partition_array ;
 	char time_str[16];
 
-	make_time_str ((time_t *)&part_info_ptr->last_update, time_str);
+	slurm_make_time_str ((time_t *)&part_info_ptr->last_update, time_str);
 	fprintf( out, "Partition data as of %s, record count %d\n",
 		time_str, part_info_ptr->record_count);
 

src/scontrol/scontrol.c

@@ -714,8 +714,8 @@ _print_job (char * job_id_str)
 	
 	if (quiet_flag == -1) {
 		char time_str[16];
-		make_time_str ((time_t *)&job_buffer_ptr->last_update, 
-				time_str);
+		slurm_make_time_str ((time_t *)&job_buffer_ptr->last_update, 
+				     time_str);
 		printf ("last_update_time=%s, records=%d\n", 
 			time_str, job_buffer_ptr->record_count);
 	}
@@ -814,8 +814,8 @@ _print_node_list (char *node_list)
 
 	if (quiet_flag == -1) {
 		char time_str[16];
-		make_time_str ((time_t *)&node_info_ptr->last_update, 
-			       time_str);
+		slurm_make_time_str ((time_t *)&node_info_ptr->last_update, 
+			             time_str);
 		printf ("last_update_time=%s, records=%d\n", 
 			time_str, node_info_ptr->record_count);
 	}
@@ -873,7 +873,7 @@ _print_part (char *partition_name)
 
 	if (quiet_flag == -1) {
 		char time_str[16];
-		make_time_str ((time_t *)&part_info_ptr->last_update, 
+		slurm_make_time_str ((time_t *)&part_info_ptr->last_update, 
 			       time_str);
 		printf ("last_update_time=%s, records=%d\n", 
 			time_str, part_info_ptr->record_count);
@@ -965,8 +965,8 @@ _print_step (char *job_step_id_str)
 
 	if (quiet_flag == -1) {
 		char time_str[16];
-		make_time_str ((time_t *)&job_step_info_ptr->last_update, 
-			       time_str);
+		slurm_make_time_str ((time_t *)&job_step_info_ptr->last_update, 
+			             time_str);
 		printf ("last_update_time=%s, records=%d\n", 
 			time_str, job_step_info_ptr->job_step_count);
 	}