X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fditto.c;h=36644f1274b9e427ad685ca2d4ceb287d9974a7a;hp=93fbe02805cb91cf1a3c06ca9005ec1550d25a31;hb=f3eb40315f9e5eff503a172aed6d325b4e1f20c6;hpb=dfaa1a3001fd447819f5edc2e523acc1a04f1440

diff --git a/test/ditto.c b/test/ditto.c
index 93fbe028..36644f12 100644
--- a/test/ditto.c
+++ b/test/ditto.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 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 +29,7 @@
 /*
  * Author: Thomas E. Dickey (1998-on)
  *
- * $Id: ditto.c,v 1.34 2009/07/17 00:07:25 tom Exp $
+ * $Id: ditto.c,v 1.41 2011/05/21 18:55:07 tom Exp $
  *
  * The program illustrates how to set up multiple screens from a single
  * program.
@@ -43,7 +43,6 @@
  */
 #include <test.priv.h>
 #include <sys/stat.h>
-#include <errno.h>
 
 #ifdef USE_PTHREADS
 #include <pthread.h>
@@ -99,6 +98,9 @@ typedef struct {
     DITTO *ditto;		/* data for all screens */
 } DDATA;
 
+static void failed(const char *) GCC_NORETURN;
+static void usage(void) GCC_NORETURN;
+
 static void
 failed(const char *s)
 {
@@ -152,12 +154,11 @@ open_tty(char *path)
     int aslave;
     char slave_name[1024];
     char s_option[sizeof(slave_name) + 80];
-    char *leaf;
 
     if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0
 	|| strlen(slave_name) > sizeof(slave_name) - 1)
 	failed("openpty");
-    if ((leaf = strrchr(slave_name, '/')) == 0) {
+    if (strrchr(slave_name, '/') == 0) {
 	errno = EISDIR;
 	failed(slave_name);
     }
@@ -213,7 +214,7 @@ init_screen(
 	WINDOW *inner = derwin(outer, high - 2, wide - 2, 1, 1);
 
 	box(outer, 0, 0);
-	mvwaddstr(outer, 0, 2, target->titles[k]);
+	MvWAddStr(outer, 0, 2, target->titles[k]);
 	wnoutrefresh(outer);
 
 	scrollok(inner, TRUE);
@@ -328,6 +329,7 @@ show_ditto(DITTO * data, int count, DDATA * ddata)
 {
     int n;
 
+    (void) data;
     for (n = 0; n < count; n++) {
 	ddata->target = n;
 	USING_SCREEN(data[n].screen, write_screen, (void *) ddata);
@@ -379,10 +381,12 @@ main(int argc, char *argv[])
 
     if (argc <= 1)
 	usage();
-    
+
     if ((data = typeCalloc(DITTO, (size_t) argc)) == 0)
 	failed("calloc data");
 
+    assert(data != 0);
+
     for (j = 0; j < argc; j++) {
 	open_screen(&data[j], argv, argc, j);
     }