Changeset 296890f3 in mainline

Timestamp:

2018-06-21T13:01:34Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a8b0c5d

Parents:

777832e

git-author:

Jiri Svoboda <jiri@…> (2018-06-21 20:00:45)

git-committer:

Jiri Svoboda <jiri@…> (2018-06-21 13:01:34)

Message:

sprintf, vsprintf belong in libc (as deprecated).

Location:

uspace/lib

Files:

• c/generic/io/snprintf.c (modified) (1 diff)
• c/generic/stdio/sprintf.c (added)
• c/generic/stdio/vsprintf.c (added)
• c/include/stdio.h (modified) (3 diffs)
• posix/include/posix/stdio.h (modified) (1 diff)
• posix/src/stdio.c (modified) (1 diff)

uspace/lib/c/generic/io/snprintf.c

@@ -35 +35 @@
 #include <stdarg.h>
 #include <stdio.h>
-#include <io/printf_core.h>
 
 /** Print formatted to the given buffer with limited size.

uspace/lib/c/include/stdio.h

@@ -84 +84 @@
 extern int fgetc(FILE *);
 extern char *fgets(char *, int, FILE *);
+extern char *gets(char *, size_t) __attribute__((deprecated));
 
 extern int getchar(void);
@@ -114 +115 @@
 extern int vasprintf(char **, const char *, va_list);
 extern int asprintf(char **, const char *, ...)
-#endif
     _HELENOS_PRINTF_ATTRIBUTE(2, 3);
+#endif
 extern int vsnprintf(char *, size_t, const char *, va_list);
+
+extern int sprintf(char *, const char *, ...)
+    __attribute__((deprecated)) _HELENOS_PRINTF_ATTRIBUTE(2, 3);
+extern int vsprintf(char *, const char *, va_list) __attribute__((deprecated));
 
 /* Formatted input */
@@ -159 +164 @@
 #define _IOLBF 1
 #define _IOFBF 2
-
-extern char *gets(char *, size_t);
 
 #endif

uspace/lib/posix/include/posix/stdio.h

@@ -66 +66 @@
     _HELENOS_PRINTF_ATTRIBUTE(2, 3);
 extern int vdprintf(int fildes, const char *__restrict__ format, va_list ap);
-extern int sprintf(char *__restrict__ s, const char *__restrict__ format, ...)
-    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
-extern int vsprintf(char *__restrict__ s, const char *__restrict__ format, va_list ap);
 
 /* File Locking */

uspace/lib/posix/src/stdio.c

@@ -278 +278 @@
 
 /**
- * Print formatted output to the string.
- *
- * @param s Output string.
- * @param format Format description.
- * @return Either the number of printed characters (excluding null byte) or
- *     negative value on error.
- */
-int sprintf(char *s, const char *restrict format, ...)
-{
-        va_list list;
-        va_start(list, format);
-        int result = vsprintf(s, format, list);
-        va_end(list);
-        return result;
-}
-
-/**
- * Print formatted output to the string.
- *
- * @param s Output string.
- * @param format Format description.
- * @param ap Print arguments.
- * @return Either the number of printed characters (excluding null byte) or
- *     negative value on error.
- */
-int vsprintf(char *s, const char *restrict format, va_list ap)
-{
-        return vsnprintf(s, INT_MAX, format, ap);
-}
-
-/**
  * Acquire file stream for the thread.
  *