From 86beed4405c240051664b5f0fcd2bb96e4b2d724 Mon Sep 17 00:00:00 2001
From: Mark Grondona <mgrondona@llnl.gov>
Date: Thu, 10 Jul 2003 18:59:49 +0000
Subject: [PATCH] o Changed fragments like: "i=strlen(foo+1); bar=xmalloc(i);
strcpy(bar,foo)" to "bar = xstrdup(foo);"
---
src/squeue/opts.c | 42 +++++++++++-------------------------------
src/squeue/print.c | 10 ++++++++--
2 files changed, 19 insertions(+), 33 deletions(-)
diff --git a/src/squeue/opts.c b/src/squeue/opts.c
index 4c1909d6ebc..a3ddaec0785 100644
--- a/src/squeue/opts.c
+++ b/src/squeue/opts.c
@@ -75,7 +75,7 @@ parse_command_line( int argc, char* argv[] )
poptContext context;
char next_opt, curr_opt;
char *env_val = NULL;
- int i = 0, rc = 0;
+ int rc = 0;
/* Declare the Options */
static const struct poptOption options[] =
@@ -192,40 +192,28 @@ parse_command_line( int argc, char* argv[] )
}
if ( ( params.format == NULL ) &&
- ( env_val = getenv("SQUEUE_FORMAT") ) ) {
- i = strlen(env_val);
- params.format = xmalloc(i);
- strcpy(params.format, env_val);
- }
+ ( env_val = getenv("SQUEUE_FORMAT") ) )
+ params.format = xstrdup(env_val);
if ( ( params.partitions == NULL ) &&
( env_val = getenv("SQUEUE_PARTITION") ) ) {
- i = strlen(env_val);
- params.partitions = xmalloc(i);
- strcpy(params.partitions, env_val);
+ params.partitions = xstrdup(env_val);
params.part_list = _build_part_list( params.partitions );
}
if ( ( params.sort == NULL ) &&
- ( env_val = getenv("SQUEUE_SORT") ) ) {
- i = strlen(env_val);
- params.sort = xmalloc(i);
- strcpy(params.sort, env_val);
- }
+ ( env_val = getenv("SQUEUE_SORT") ) )
+ params.sort = xstrdup(env_val);
if ( ( params.states == NULL ) &&
( env_val = getenv("SQUEUE_STATES") ) ) {
- i = strlen(env_val);
- params.states = xmalloc(i);
- strcpy(params.states, env_val);
+ params.states = xstrdup(env_val);
params.state_list = _build_state_list( params.states );
}
if ( ( params.users == NULL ) &&
( env_val = getenv("SQUEUE_USERS") ) ) {
- i = strlen(env_val);
- params.users = xmalloc(i);
- strcpy(params.users, env_val);
+ params.users = xstrdup(env_val);
params.user_list = _build_user_list( params.users );
}
@@ -695,7 +683,6 @@ _build_state_list( char* str )
{
List my_list;
char *state, *tmp_char, *my_state_list;
- int i;
enum job_states *state_id;
if ( str == NULL)
@@ -704,9 +691,7 @@ _build_state_list( char* str )
return _build_all_states_list ();
my_list = list_create( NULL );
- i = strlen( str );
- my_state_list = xmalloc( i+1 );
- strcpy( my_state_list, str );
+ my_state_list = xstrdup( str );
state = strtok_r( my_state_list, ",", &tmp_char );
while (state)
{
@@ -763,9 +748,7 @@ _build_step_list( char* str )
if ( str == NULL)
return NULL;
my_list = list_create( NULL );
- i = strlen( str );
- my_step_list = xmalloc( i+1 );
- strcpy( my_step_list, str );
+ my_step_list = xstrdup( str );
step = strtok_r( my_step_list, ",", &tmp_char );
while (step)
{
@@ -802,16 +785,13 @@ _build_user_list( char* str )
{
List my_list;
char *user, *tmp_char, *my_user_list;
- int i;
uint32_t *uid;
struct passwd *passwd_ptr;
if ( str == NULL)
return NULL;
my_list = list_create( NULL );
- i = strlen( str );
- my_user_list = xmalloc( i+1 );
- strcpy( my_user_list, str );
+ my_user_list = xstrdup( str );
user = strtok_r( my_user_list, ",", &tmp_char );
while (user)
{
diff --git a/src/squeue/print.c b/src/squeue/print.c
index 3e6eca88dcf..728c1a4362b 100644
--- a/src/squeue/print.c
+++ b/src/squeue/print.c
@@ -294,7 +294,7 @@ int print_job_from_format(job_info_t * job, List list)
{
ListIterator i = list_iterator_create(list);
job_format_t *current;
- int total_width = 0, inx;
+ int total_width = 0;
while ((current = (job_format_t *) list_next(i)) != NULL) {
if (current->
@@ -310,12 +310,15 @@ int print_job_from_format(job_info_t * job, List list)
list_iterator_destroy(i);
printf("\n");
+#if 0
if (job == NULL) {
+ int inx;
/* one-origin for no trailing space */
for (inx=1; inx<total_width; inx++)
printf("-");
printf("\n");
}
+#endif
return SLURM_SUCCESS;
}
@@ -697,7 +700,7 @@ int print_step_from_format(job_step_info_t * job_step, List list)
{
ListIterator i = list_iterator_create(list);
step_format_t *current;
- int total_width = 0, inx;
+ int total_width = 0;
while ((current = (step_format_t *) list_next(i)) != NULL) {
if (current->
@@ -712,12 +715,15 @@ int print_step_from_format(job_step_info_t * job_step, List list)
}
list_iterator_destroy(i);
printf("\n");
+#if 0
if (job_step == NULL) {
+ int inx;
/* one-origin for no trailing space */
for (inx=1; inx<total_width; inx++)
printf("-");
printf("\n");
}
+#endif
return SLURM_SUCCESS;
}
--
GitLab