X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Fvsscanf.c;h=e6253c3a38a3365dea2404da089065bfbb228547;hp=12df4aa3c15d4c9c3170650896852d9aada658e9;hb=26522e4669dbf45cba32138b5d81c6c292e88e60;hpb=46722468f47c2b77b3987729b4bcf2321cccfd01

diff --git a/ncurses/base/vsscanf.c b/ncurses/base/vsscanf.c
index 12df4aa3..e6253c3a 100644
--- a/ncurses/base/vsscanf.c
+++ b/ncurses/base/vsscanf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2003,2004 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            *
@@ -38,7 +38,7 @@
 
 #if !HAVE_VSSCANF
 
-MODULE_ID("$Id: vsscanf.c,v 1.16 2002/09/07 17:27:56 tom Exp $")
+MODULE_ID("$Id: vsscanf.c,v 1.18 2004/04/03 20:27:02 tom Exp $")
 
 #if !(HAVE_VFSCANF || HAVE__DOSCAN)
 
@@ -230,7 +230,7 @@ vsscanf(const char *str, const char *format, va_list ap)
 		/* find a chunk */
 		state = sUnknown;
 		chunk = cUnknown;
-		other = cUnknown;
+		other = oUnknown;
 		pointer = 0;
 		for (n = 0; format[n] != 0 && state != sFinal; ++n) {
 		    my_fmt[n] = format[n];
@@ -271,7 +271,7 @@ vsscanf(const char *str, const char *format, va_list ap)
 				chunk = ctest;
 			    } else if ((otest = other_ch(format[n])) != oUnknown) {
 				other = otest;
-			    } else if (isalpha(format[n])) {
+			    } else if (isalpha(UChar(format[n]))) {
 				state = sFinal;
 				chunk = cError;
 			    }