summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2008-10-21 17:34:31 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2008-10-21 17:34:31 +0000
commit7059a47de1e95a65b8ed9e14af961364f3be285a (patch)
tree349778b3151879d84408f5587a08383a1e92ecb0
parentda43c878fa04bcb37f4525e7c3edd83dff46789d (diff)
downloadATCD-7059a47de1e95a65b8ed9e14af961364f3be285a.tar.gz
Tue Oct 21 17:33:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/ace/OS_NS_stdio.cpp4
-rw-r--r--ACE/ace/OS_NS_stdio.h4
3 files changed, 9 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 025db09d62c..1b92a6ca820 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 21 17:33:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/OS_NS_stdio.{h,cpp}:
+ Buf argument of sscanf should be const
+
Tue Oct 21 14:35:00 UTC 2008 Simon Massey <sma at prismtech dot com>
* tests/Bug_2980_Regression_Test.cpp:
diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp
index 4205f0a7a98..b753c5e5b59 100644
--- a/ACE/ace/OS_NS_stdio.cpp
+++ b/ACE/ace/OS_NS_stdio.cpp
@@ -489,7 +489,7 @@ ACE_OS::scanf (const wchar_t *format, ...)
#endif /* ACE_HAS_WCHAR */
int
-ACE_OS::sscanf (char *buf, const char *format, ...)
+ACE_OS::sscanf (const char *buf, const char *format, ...)
{
int result;
va_list ap;
@@ -501,7 +501,7 @@ ACE_OS::sscanf (char *buf, const char *format, ...)
#if defined (ACE_HAS_WCHAR)
int
-ACE_OS::sscanf (wchar_t *buf, const wchar_t *format, ...)
+ACE_OS::sscanf (const wchar_t *buf, const wchar_t *format, ...)
{
#if defined (ACE_LACKS_SWSCANF)
ACE_UNUSED_ARG (buf);
diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h
index c976f11063e..36f9685331f 100644
--- a/ACE/ace/OS_NS_stdio.h
+++ b/ACE/ace/OS_NS_stdio.h
@@ -481,11 +481,11 @@ namespace ACE_OS {
# endif /* ACE_HAS_WCHAR */
extern ACE_Export
- int sscanf (char *buf, const char *format, ...);
+ int sscanf (const char *buf, const char *format, ...);
# if defined (ACE_HAS_WCHAR)
extern ACE_Export
- int sscanf (wchar_t *buf, const wchar_t *format, ...);
+ int sscanf (const wchar_t *buf, const wchar_t *format, ...);
# endif /* ACE_HAS_WCHAR */
ACE_NAMESPACE_INLINE_FUNCTION