From a4548845d16fe32b9b5fe3fe64ee60a56956b877 Mon Sep 17 00:00:00 2001
From: Mark Grondona <mgrondona@llnl.gov>
Date: Thu, 10 Jul 2003 18:52:50 +0000
Subject: [PATCH] o Change fragments like: "i = strlen(foo); bar =
xmalloc(i+1); strcpy(bar,foo) to "bar = xstrdup(foo);":
---
src/sinfo/opts.c | 2 +-
src/sinfo/print.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/sinfo/opts.c b/src/sinfo/opts.c
index a9972eb0f60..7de226e3952 100644
--- a/src/sinfo/opts.c
+++ b/src/sinfo/opts.c
@@ -72,7 +72,7 @@ int parse_command_line(int argc, char *argv[])
poptContext context;
int curr_opt;
- int i = 0, rc = 0;
+ int rc = 0;
char *env_val = NULL;
static char *temp_state = NULL;
diff --git a/src/sinfo/print.c b/src/sinfo/print.c
index 8c191d297bc..1f4e608ef68 100644
--- a/src/sinfo/print.c
+++ b/src/sinfo/print.c
@@ -33,6 +33,7 @@
#include "src/common/list.h"
#include "src/common/hostlist.h"
#include "src/common/xmalloc.h"
+#include "src/common/xstring.h"
#include "src/sinfo/print.h"
#include "src/sinfo/sinfo.h"
@@ -395,10 +396,9 @@ int _print_partition(sinfo_data_t * sinfo_data, int width,
_print_str("N/A", width, right_justify, true);
else {
char *tmp;
- tmp = xmalloc(strlen(sinfo_data->part_info->name)+2);
- strcpy(tmp, sinfo_data->part_info->name);
+ tmp = xstrdup(sinfo_data->part_info->name);
if (sinfo_data->part_info->default_part)
- strcat(tmp, "*");
+ xstrcat(tmp, "*");
_print_str(tmp, width, right_justify, true);
xfree(tmp);
}
--
GitLab