Sun Oct 26 20:21:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 18 insertions, 116 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 0ea9ce599bc..8bc66df5522 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,18 @@
+Sun Oct 26 20:21:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+		    * ace/OS_NS_stdio.cpp:
+		    * ace/OS_NS_stdio.h:
+		      Removed scanf/fscanf/sscanf wrappers again. Microsoft
+		      doesn't ship them with msvc so these would then be
+		      a noop making them unusable
+		      
+		    * ace/fuzz.pl:
+		      Removed scanf/sscanf/fscanf from the ACE_OS check
+		      
+		    * ace/Multicast_Test.cpp
+		    * ace/Multicast_Test_IPV6.cpp
+		      Use plain sscanf
+
 Sun Oct 26 18:47:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 		    * ace/INET_Addr.cpp:
diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp
index 8d1abc93aae..fdb3d69e373 100644
--- a/ACE/ace/OS_NS_stdio.cpp
+++ b/ACE/ace/OS_NS_stdio.cpp
@@ -459,93 +459,4 @@ ACE_OS::vaswprintf_emulation(wchar_t **bufp, const wchar_t *format, va_list argp
 #endif /* !ACE_HAS_VASWPRINTF */
 #endif /* ACE_HAS_WCHAR */
 
-int
-ACE_OS::scanf (const char *format, ...)
-{
-  int result;
-  va_list ap;
-  va_start (ap, format);
-  ACE_OSCALL (::vscanf (format, ap), int, -1, result);
-  va_end (ap);
-  return result;
-}
-
-#if defined (ACE_HAS_WCHAR)
-int
-ACE_OS::scanf (const wchar_t *format, ...)
-{
-#if defined (ACE_LACKS_VWSCANF)
-  ACE_UNUSED_ARG (format);
-  ACE_NOTSUP_RETURN (-1);
-#else
-  int result;
-  va_list ap;
-  va_start (ap, format);
-  ACE_OSCALL (::vwscanf (format, ap), int, -1, result);
-  va_end (ap);
-  return result;
-#endif
-}
-#endif /* ACE_HAS_WCHAR */
-
-int
-ACE_OS::sscanf (const char *buf, const char *format, ...)
-{
-  int result;
-  va_list ap;
-  va_start (ap, format);
-  ACE_OSCALL (::vsscanf (buf, format, ap), int, -1, result);
-  va_end (ap);
-  return result;
-}
-
-#if defined (ACE_HAS_WCHAR)
-int
-ACE_OS::sscanf (const wchar_t *buf, const wchar_t *format, ...)
-{
-#if defined (ACE_LACKS_VSWSCANF)
-  ACE_UNUSED_ARG (buf);
-  ACE_UNUSED_ARG (format);
-  ACE_NOTSUP_RETURN (-1);
-#else
-  int result;
-  va_list ap;
-  va_start (ap, format);
-  ACE_OSCALL (::vswscanf (buf, format, ap), int, -1, result);
-  va_end (ap);
-  return result;
-#endif
-}
-#endif /* ACE_HAS_WCHAR */
-
-int
-ACE_OS::fscanf (FILE* stream, const char *format, ...)
-{
-  int result;
-  va_list ap;
-  va_start (ap, format);
-  ACE_OSCALL (::vfscanf (stream, format, ap), int, -1, result);
-  va_end (ap);
-  return result;
-}
-
-#if defined (ACE_HAS_WCHAR)
-int
-ACE_OS::fscanf (FILE* stream, const wchar_t *format, ...)
-{
-#if defined (ACE_LACKS_VFWSCANF)
-  ACE_UNUSED_ARG (format);
-  ACE_NOTSUP_RETURN (-1);
-#else
-  int result;
-  va_list ap;
-  va_start (ap, format);
-  ACE_OSCALL (::vfwscanf (stream, format, ap), int, -1, result);
-  va_end (ap);
-  return result;
-#endif
-}
-#endif /* ACE_HAS_WCHAR */
-
-
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h
index 6732169f082..3133628d5dc 100644
--- a/ACE/ace/OS_NS_stdio.h
+++ b/ACE/ace/OS_NS_stdio.h
@@ -326,14 +326,6 @@ namespace ACE_OS {
   FILE *fopen (const wchar_t *filename, const char *mode);
 #endif /* ACE_HAS_WCHAR */
 
-  extern ACE_Export
-  int fscanf (FILE* stream, const char *format, ...);
-
-#if defined (ACE_HAS_WCHAR)
-  extern ACE_Export
-  int fscanf (FILE* stream, const wchar_t *format, ...);
-#endif
-
 #if defined (ACE_WIN32)
   /// Default Win32 Security Attributes definition.
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -480,22 +472,6 @@ namespace ACE_OS {
   int sprintf (wchar_t *buf, const wchar_t *format, ...);
 # endif /* ACE_HAS_WCHAR */
 
-  extern ACE_Export
-  int scanf (const char *format, ...);
-
-#if defined (ACE_HAS_WCHAR)
-  extern ACE_Export
-  int scanf (const wchar_t *format, ...);
-#endif
-
-  extern ACE_Export
-  int sscanf (const char *buf, const char *format, ...);
-
-# if defined (ACE_HAS_WCHAR)
-  extern ACE_Export
-  int sscanf (const wchar_t *buf, const wchar_t *format, ...);
-# endif /* ACE_HAS_WCHAR */
-
   ACE_NAMESPACE_INLINE_FUNCTION
   char *tempnam (const char *dir = 0,
                  const char *pfx = 0);
diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl
index 4a31078fbc1..6f80dbffa52 100755
--- a/ACE/bin/fuzz.pl
+++ b/ACE/bin/fuzz.pl
@@ -422,7 +422,7 @@ sub check_for_lack_ACE_OS ()
 
     $OS_NS_signal_symbols = "kill|pthread_sigmask|sigaction|sigaddset|sigdelset|sigemptyset|sigfillset|sigismember|signal|sigprocmask|sigsuspend|raise";
 
-    $OS_NS_stdio_symbols = "checkUnicodeFormat|clearerr|cuserid|fclose|fdopen|fflush|fgetc|getc|fgetpos|fgets|flock_adjust_params|flock_init|flock_destroy|flock_rdlock|flock_tryrdlock|flock_trywrlock|flock_unlock|flock_wrlock|fopen|default_win32_security_attributes|default_win32_security_attributes_r|get_win32_versioninfo|get_win32_resource_module|set_win32_resource_module|scanf|sscanf|fscanf|fprintf|ungetc|fputc|putc|fputs|fread|freopen|fseek|fsetpos|ftell|fwrite|perror|printf|puts|rename|rewind|snprintf|sprintf|tempnam|vsprintf|vsnprintf|asprintf|aswprintf|vasprintf|vaswprintf";
+    $OS_NS_stdio_symbols = "checkUnicodeFormat|clearerr|cuserid|fclose|fdopen|fflush|fgetc|getc|fgetpos|fgets|flock_adjust_params|flock_init|flock_destroy|flock_rdlock|flock_tryrdlock|flock_trywrlock|flock_unlock|flock_wrlock|fopen|default_win32_security_attributes|default_win32_security_attributes_r|get_win32_versioninfo|get_win32_resource_module|set_win32_resource_module|fprintf|ungetc|fputc|putc|fputs|fread|freopen|fseek|fsetpos|ftell|fwrite|perror|printf|puts|rename|rewind|snprintf|sprintf|tempnam|vsprintf|vsnprintf|asprintf|aswprintf|vasprintf|vaswprintf";
 
     $OS_NS_stdlib_symbols = "_exit|abort|atexit|atof|atol|atoi|atop|bsearch|calloc|exit|free|getenv|getenvstrings|itoa|itoa_emulation|itow_emulation|malloc|mkstemp|mkstemp_emulation|mktemp|putenv|qsort|rand|rand_r|realloc|realpath|set_exit_hook|srand|strenvdup|strtod|strtol|strtol_emulation|strtoul|strtoul_emulation|strtoll|strtoll_emulation|strtoull|strtoull_emulation|system|getprogname|setprogname";
 
diff --git a/ACE/tests/Multicast_Test.cpp b/ACE/tests/Multicast_Test.cpp
index 45310eee073..53015f1895b 100644
--- a/ACE/tests/Multicast_Test.cpp
+++ b/ACE/tests/Multicast_Test.cpp
@@ -827,7 +827,7 @@ int producer (MCT_Config &config)
 int advance_addr (ACE_INET_Addr &addr)
 {
   int a, b, c, d;
-  ACE_OS::sscanf (addr.get_host_addr (), "%d.%d.%d.%d", &a, &b, &c, &d);
+  ::sscanf (addr.get_host_addr (), "%d.%d.%d.%d", &a, &b, &c, &d);
   if (d < 255)
     ++d;
   else if (c < 255)
diff --git a/ACE/tests/Multicast_Test_IPV6.cpp b/ACE/tests/Multicast_Test_IPV6.cpp
index 6a0fa2280b7..337d3a43b5c 100644
--- a/ACE/tests/Multicast_Test_IPV6.cpp
+++ b/ACE/tests/Multicast_Test_IPV6.cpp
@@ -872,7 +872,7 @@ int advance_addr (ACE_INET_Addr &addr)
   int a, b, c, d;
   if (addr.get_type () == AF_INET)
     {
-      ACE_OS::sscanf (addr.get_host_addr (), "%d.%d.%d.%d", &a, &b, &c, &d);
+      ::sscanf (addr.get_host_addr (), "%d.%d.%d.%d", &a, &b, &c, &d);
       if (d < 255)
         ++d;
       else if (c < 255)