wdvi

commit 80b2614e968cbabec374b1374bd460902edd5844
parent 2b7a920f5fd65549c2d84a119ecf42969dcbe056
Author: Kyle Milz <krwmilz@gmail.com>
Date:   Thu, 19 Aug 2021 19:47:18 +0000

assume we have vsnprintf

Diffstat:
M
dvi-draw.c
 | 
8
--------
M
popups.c
 | 
84
+------------------------------------------------------------------------------

2 files changed, 1 insertion(+), 91 deletions(-)
diff --git a/dvi-draw.c b/dvi-draw.c
@@ -2397,12 +2397,8 @@ src_spawn_editor(parsed)
 			    break;
 			case 'l':
 			    p1 = scr_str;
-#if HAVE_VSNPRINTF
 			    len = snprintf(scr_str, sizeof scr_str, "%d",
 			      parsed->line);
-#else
-			    len = sprintf(scr_str, "%d", parsed->line);
-#endif
 			    break;
 			case 'c':
 			    if (parsed->col == 0) {
@@ -2410,12 +2406,8 @@ src_spawn_editor(parsed)
 				continue;
 			    }
 			    p1 = scr_str;
-#if HAVE_VSNPRINTF
 			    len = snprintf(scr_str, sizeof scr_str, "%d",
 			      parsed->col);
-#else
-			    len = sprintf(scr_str, "%d", parsed->col);
-#endif
 			    break;
 			case 'f':
 			    p1 = filename2;
diff --git a/popups.c b/popups.c
@@ -136,74 +136,8 @@ static int uintlen(i)
 /*
  *	(v)nprintf(fmt, ...) - return the length of the string produced.
  */
+#define vnprintf(fmt, ap)	vsnprintf(NULL, 0, fmt, ap)
 
-#if HAVE_GOOD_VSNPRINTF
-
-# define vnprintf(fmt, ap)	vsnprintf(NULL, 0, fmt, ap)
-
-#else /* !HAVE_GOOD_VSNPRINTF */
-
-static int
-vnprintf(format, args)
-	const char	*format;
-	va_list		args;
-{
-	const char	*p, *p_end, *q;
-	int		len;
-
-	p = format;
-	p_end = p + strlen(p);
-	len = 0;
-	for (;;) {
-	    q = memchr(p, '%', p_end - p);
-	    if (q == NULL) {
-		len += p_end - p;
-		break;
-	    }
-	    len += q - p;
-	    p = q + 1;
-	    switch (*p++) {
-		case '%':
-		    ++len;
-		    break;
-		case 'd':
-		    {
-			int i = va_arg(args, int);
-
-			len += (i < 0 ? uintlen(-i) + 1 : uintlen(i));
-		    }
-		    break;
-		case 's':
-		    len += strlen(va_arg(args, const char *));
-		    break;
-		default:
-		    oops("Invalid designator `%c' in format string \"%s\"\n",
-			p[-1], format);
-	    }
-	}
-
-	return len;
-}
-
-
-#if 0	/* not needed (yet) */
-
-static int
-nprintf(const char *format, ...)
-{
-	va_list		args;
-	int		len;
-
-	va_start(args, format);
-
-	len = vnprintf(format, args);
-	va_end(args);
-	return len;
-}
-
-#endif /* if 0 */
-
-#endif /* !HAVE_GOOD_VSNPRINTF */
 
 /*
  *	(v)mprintf(fmt, ...) - printf to allocated string.
@@ -230,11 +164,7 @@ vmprintf(format, args)
 	va_end(args2);
 
 	result = xmalloc(len);
-# if HAVE_VSNPRINTF
 	(void) vsnprintf(result, len, format, args);
-# else
-	(void) vsprintf(result, format, args);
-# endif
 #endif /* ! HAVE_VASPRINTF */
 
 	return result;
@@ -913,11 +843,7 @@ file_refresh()
 		    if (icon_list[i] == NULL) {
 			char	s[3 * sizeof(int) + 1];
 
-#if HAVE_VSNPRINTF
 			(void) snprintf(s, sizeof s, "i%u", i);
-#else
-			(void) sprintf(s2, "i%u", i);
-#endif
 			icon_list[i] = XtVaCreateManagedWidget(s,
 			  labelWidgetClass, f2form,
 			  XtNbitmap, filedir_pm,
@@ -978,11 +904,7 @@ file_refresh()
 	    while (head != NULL) {
 		char	s[3 * sizeof(int) + 1];
 
-#if HAVE_VSNPRINTF
 		(void) snprintf(s, sizeof s, "i%u", i);
-#else
-		(void) sprintf(s2, "i%u", i);
-#endif
 		icon_list[i] = *head->name != '0' ? NULL
 		  : XtVaCreateManagedWidget(s, labelWidgetClass, f2form,
 		  XtNbitmap, filedir_pm,
@@ -2553,11 +2475,7 @@ Act_print P4C(Widget, w, XEvent *, event, String *, params,
 	    XtVaSetValues(r3text, XtNstring, s, NULL);
 	    XawTextSetInsertionPoint(r3text, strlen(s));
 
-#if HAVE_VSNPRINTF
 	    (void) snprintf(s2, sizeof s2, "%d", current_page + pageno_correct);
-#else
-	    (void) sprintf(s2, "%d", current_page + pageno_correct);
-#endif
 	    XtVaSetValues(r7text1, XtNstring, s2, NULL);
 	    XawTextSetInsertionPoint(r7text1, strlen(s2));
 	    XtVaSetValues(r7text2, XtNstring, s2, NULL);