X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=test%2Ftest_sgr.c;h=33564adb2a51805784181cf6e98a57669476aae0;hb=e6bb3226cdd35f5fd9f45bb1685cc2203c889480;hp=e19afc5070fcfbe0579590a10870a425820f0217;hpb=3e7e5f8b5c4e8e499f682a1c414c576c16d47532;p=ncurses.git

diff --git a/test/test_sgr.c b/test/test_sgr.c
index e19afc50..33564adb 100644
--- a/test/test_sgr.c
+++ b/test/test_sgr.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2015-2016,2017 Free Software Foundation, Inc.              *
+ * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2015-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -29,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_sgr.c,v 1.11 2017/06/24 18:35:25 tom Exp $
+ * $Id: test_sgr.c,v 1.17 2021/03/27 22:43:36 tom Exp $
  *
  * A simple demo of the sgr/sgr0 terminal capabilities.
  */
@@ -37,7 +38,7 @@
 #include <test.priv.h>
 
 #if !HAVE_TIGETSTR
-static void failed(const char *) GCC_NORETURN;
+static GCC_NORETURN void failed(const char *);
 
 static void
 failed(const char *msg)
@@ -115,7 +116,7 @@ next_dbitem(void)
 	    db_item++;
 	}
     }
-    printf("** %s\n", result);
+    printf("** %s\n", result ? result : "<null>");
     return result;
 }
 
@@ -147,7 +148,7 @@ dumpit(unsigned bits, unsigned ignore, const char *sgr, const char *sgr0)
     static char params[] = "SURBDBIPA";
     unsigned n;
 
-    printf("%4d ", bits);
+    printf("%4u ", bits);
     bits &= ~ignore;
     for (n = 0; n < MAXPAR; ++n) {
 	putchar((int) ((bits & (unsigned) (1 << n)) ? params[n] : '-'));
@@ -182,22 +183,23 @@ brute_force(const char *name)
     char *my_bold;
     char *my_revs;
     char *my_smso;
+    char *my_name = strdup(name);
 
     if (db_list) {
 	putenv(next_dbitem());
     }
 
     if (!q_opt)
-	printf("Terminal type \"%s\"\n", name);
+	printf("Terminal type \"%s\"\n", my_name);
 
     if (no_init) {
 	START_TRACE();
     } else {
-	setupterm((NCURSES_CONST char *) name, 1, (int *) 0);
+	setupterm((NCURSES_CONST char *) my_name, 1, (int *) 0);
     }
 
     if (!q_opt) {
-	if (strcmp(name, ttytype))
+	if (strcmp(my_name, ttytype))
 	    printf("... actual \"%s\"\n", ttytype);
     }
 
@@ -298,6 +300,7 @@ brute_force(const char *name)
 	    free(values[count]);
 	}
     }
+    free(my_name);
     del_curterm(cur_term);
 }