diff --git a/src/sinfo/opts.c b/src/sinfo/opts.c
index a9972eb0f6077ab975c4ae0cca7936dfdb20568e..7de226e3952e86ee80f816dd84bdca18d08d1f2a 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 8c191d297bcba033ae7a01f859403e32e704a4ca..1f4e608ef687df8181508ab9a2ece5a3b47d69a9 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);
 		}