Missed changes in ncurses-5.2-20010114 commit

1 files changed, 47 insertions, 45 deletions

diff --git a/lib/libcurses/base/lib_slkset.c b/lib/libcurses/base/lib_slkset.c
index 9014957a5d6..a8360d60f49 100644
--- a/lib/libcurses/base/lib_slkset.c
+++ b/lib/libcurses/base/lib_slkset.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lib_slkset.c,v 1.2 2001/01/22 18:01:46 millert Exp $	*/
+/*	$OpenBSD: lib_slkset.c,v 1.3 2001/01/22 18:05:43 millert Exp $	*/
 
 /****************************************************************************
  * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
@@ -40,57 +40,59 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$From: lib_slkset.c,v 1.3 1998/02/11 12:13:56 tom Exp $")
+MODULE_ID("$From: lib_slkset.c,v 1.6 2000/12/10 02:43:27 tom Exp $")
 
-int
+NCURSES_EXPORT(int)
 slk_set(int i, const char *astr, int format)
 {
-SLK *slk = SP->_slk;
-size_t len;
-const char *str = astr;
-const char *p;
+    SLK *slk = SP->_slk;
+    size_t len;
+    const char *str = astr;
+    const char *p;
 
-	T((T_CALLED("slk_set(%d, \"%s\", %d)"), i, str, format));
+    T((T_CALLED("slk_set(%d, \"%s\", %d)"), i, str, format));
 
-	if (slk == NULL || i < 1 || i > slk->labcnt || format < 0 || format > 2)
-		returnCode(ERR);
-	if (str == NULL)
-		str = "";
+    if (slk == NULL || i < 1 || i > slk->labcnt || format < 0 || format > 2)
+	returnCode(ERR);
+    if (str == NULL)
+	str = "";
 
-	while (isspace(*str)) str++; /* skip over leading spaces  */
-	p = str;
-	while (isprint(*p)) p++;     /* The first non-print stops */
+    while (isspace(CharOf(*str)))
+	str++;			/* skip over leading spaces  */
+    p = str;
+    while (isprint(CharOf(*p)))
+	p++;			/* The first non-print stops */
 
-	--i; /* Adjust numbering of labels */
+    --i;			/* Adjust numbering of labels */
 
-	len = (size_t)(p - str);
-	if (len > (unsigned)slk->maxlen)
-	  len = slk->maxlen;
-	if (len==0)
-	  slk->ent[i].text[0] = 0;
-	else
-	  (void) strlcpy(slk->ent[i].text, str, len+1);
-	memset(slk->ent[i].form_text,' ', (unsigned)slk->maxlen);
-	/* len = strlen(slk->ent[i].text); */
+    len = (size_t) (p - str);
+    if (len > (unsigned) slk->maxlen)
+	len = slk->maxlen;
+    if (len == 0)
+	slk->ent[i].text[0] = 0;
+    else
+	(void) strlcpy(slk->ent[i].text, str, len+1);
+    memset(slk->ent[i].form_text, ' ', (unsigned) slk->maxlen);
+    /* len = strlen(slk->ent[i].text); */
 
-	switch(format) {
-	case 0: /* left-justified */
-		memcpy(slk->ent[i].form_text,
-		       slk->ent[i].text,
-		       len);
-		break;
-	case 1: /* centered */
-		memcpy(slk->ent[i].form_text+(slk->maxlen - len)/2,
-		       slk->ent[i].text,
-		       len);
-		break;
-	case 2: /* right-justified */
-		memcpy(slk->ent[i].form_text+ slk->maxlen - len,
-		       slk->ent[i].text,
-		       len);
-		break;
-	}
-	slk->ent[i].form_text[slk->maxlen] = 0;
-	slk->ent[i].dirty = TRUE;
-	returnCode(OK);
+    switch (format) {
+    case 0:			/* left-justified */
+	memcpy(slk->ent[i].form_text,
+	       slk->ent[i].text,
+	       len);
+	break;
+    case 1:			/* centered */
+	memcpy(slk->ent[i].form_text + (slk->maxlen - len) / 2,
+	       slk->ent[i].text,
+	       len);
+	break;
+    case 2:			/* right-justified */
+	memcpy(slk->ent[i].form_text + slk->maxlen - len,
+	       slk->ent[i].text,
+	       len);
+	break;
+    }
+    slk->ent[i].form_text[slk->maxlen] = 0;
+    slk->ent[i].dirty = TRUE;
+    returnCode(OK);
 }