X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftrace%2Ftrace_xnames.c;h=2d743368de2f799d91e480d7cedab6ea5fbcb3a0;hp=6287fc85c0a65112cd53f8573797bf9a68b43b18;hb=1f7a36fe16b11bb4aab51be89bbc1b0f75936b78;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/trace/trace_xnames.c b/ncurses/trace/trace_xnames.c
index 6287fc85..2d743368 100644
--- a/ncurses/trace/trace_xnames.c
+++ b/ncurses/trace/trace_xnames.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1999 Free Software Foundation, Inc.                        *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1999-2010,2016 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            *
@@ -34,17 +35,18 @@
  */
 
 #include <curses.priv.h>
-#include <term_entry.h>
 
-MODULE_ID("$Id: trace_xnames.c,v 1.3 1999/03/02 01:20:38 tom Exp $")
+MODULE_ID("$Id: trace_xnames.c,v 1.8 2020/02/02 23:34:34 tom Exp $")
 
-void _nc_trace_xnames(TERMTYPE *tp GCC_UNUSED)
+NCURSES_EXPORT(void)
+_nc_trace_xnames(TERMTYPE *tp GCC_UNUSED)
 {
 #ifdef TRACE
 #if NCURSES_XNAMES
     int limit = tp->ext_Booleans + tp->ext_Numbers + tp->ext_Strings;
-    int n, m;
+
     if (limit) {
+	int n;
 	int begin_num = tp->ext_Booleans;
 	int begin_str = tp->ext_Booleans + tp->ext_Numbers;
 
@@ -53,19 +55,22 @@ void _nc_trace_xnames(TERMTYPE *tp GCC_UNUSED)
 		limit,
 		tp->ext_Booleans, tp->ext_Numbers, tp->ext_Strings,
 		tp->num_Booleans, tp->num_Numbers, tp->num_Strings);
+
 	for (n = 0; n < limit; n++) {
+	    int m;
+
 	    if ((m = n - begin_str) >= 0) {
 		_tracef("[%d] %s = %s", n,
-		    tp->ext_Names[n],
-		    _nc_visbuf(tp->Strings[tp->num_Strings + m - tp->ext_Strings]));
+			tp->ext_Names[n],
+			_nc_visbuf(tp->Strings[tp->num_Strings + m - tp->ext_Strings]));
 	    } else if ((m = n - begin_num) >= 0) {
 		_tracef("[%d] %s = %d (num)", n,
-		    tp->ext_Names[n],
-		    tp->Numbers[tp->num_Numbers + m - tp->ext_Numbers]);
+			tp->ext_Names[n],
+			tp->Numbers[tp->num_Numbers + m - tp->ext_Numbers]);
 	    } else {
 		_tracef("[%d] %s = %d (bool)", n,
-		    tp->ext_Names[n],
-		    tp->Booleans[tp->num_Booleans + n - tp->ext_Booleans]);
+			tp->ext_Names[n],
+			tp->Booleans[tp->num_Booleans + n - tp->ext_Booleans]);
 	    }
 	}
     }