Loading...
stdio/FreeBSD/printf-pos.c Libc-1583.60.2 Libc-763.13
--- Libc/Libc-1583.60.2/stdio/FreeBSD/printf-pos.c
+++ Libc/Libc-763.13/stdio/FreeBSD/printf-pos.c
@@ -63,10 +63,7 @@
 	T_LONG, T_U_LONG, TP_LONG, T_LLONG, T_U_LLONG, TP_LLONG,
 	T_PTRDIFFT, TP_PTRDIFFT, T_SSIZET, T_SIZET, TP_SSIZET,
 	T_INTMAXT, T_UINTMAXT, TP_INTMAXT, TP_VOID, TP_CHAR, TP_SCHAR,
-	T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR,
-#ifdef VECTORS
- 	T_VECTOR,
-#endif
+	T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR
 };
 
 /* An expandable array of types. */
@@ -243,7 +240,7 @@
  * It will be replaces with a malloc-ed one if it overflows.
  * Returns 0 on success. On failure, returns nonzero and sets errno.
  */ 
-__private_extern__ int
+int
 __find_arguments (const char *fmt0, va_list ap, union arg **argtable)
 {
 	char *fmt;		/* format string */
@@ -345,11 +342,7 @@
 			/*FALLTHROUGH*/
 		case 'c':
 			error = addtype(&types,
-#ifdef VECTORS
-					(flags & LONGINT) ? T_WINT : ((flags & VECTOR) ? T_VECTOR : T_INT));
-#else
 					(flags & LONGINT) ? T_WINT : T_INT);
-#endif
 			if (error)
 				goto error;
 			break;
@@ -358,12 +351,6 @@
 			/*FALLTHROUGH*/
 		case 'd':
 		case 'i':
-#ifdef VECTORS
-			if (flags & VECTOR) {
-				if ((error = addtype(&types, T_VECTOR)))
-					goto error;
-			} else
-#endif
 			if ((error = addsarg(&types, flags)))
 				goto error;
 			break;
@@ -373,15 +360,10 @@
 		case 'e':
 		case 'E':
 		case 'f':
-		case 'F':
 		case 'g':
 		case 'G':
 			error = addtype(&types,
-#ifdef VECTORS
-			    (flags & VECTOR) ? T_VECTOR : ((flags & LONGDBL) ? T_LONG_DOUBLE : T_DOUBLE));
-#else
 			    (flags & LONGDBL) ? T_LONG_DOUBLE : T_DOUBLE);
-#endif
 			if (error)
 				goto error;
 			break;
@@ -410,21 +392,11 @@
 			flags |= LONGINT;
 			/*FALLTHROUGH*/
 		case 'o':
-#ifdef VECTORS
-			if (flags & VECTOR) {
-				if ((error = addtype(&types, T_VECTOR)))
-					goto error;
-			} else
-#endif
 			if ((error = adduarg(&types, flags)))
 				goto error;
 			break;
 		case 'p':
-#ifdef VECTORS
-			if ((error = addtype(&types, (flags & VECTOR) ? T_VECTOR : TP_VOID)))
-#else
 			if ((error = addtype(&types, TP_VOID)))
-#endif
 				goto error;
 			break;
 		case 'S':
@@ -442,12 +414,6 @@
 		case 'u':
 		case 'X':
 		case 'x':
-#ifdef VECTORS
-			if (flags & VECTOR) {
-				if ((error = addtype(&types, T_VECTOR)))
-					goto error;
-			} else
-#endif
 			if ((error = adduarg(&types, flags)))
 				goto error;
 			break;
@@ -465,7 +431,7 @@
 }
 
 /* wchar version of __find_arguments. */
-__private_extern__ int
+int
 __find_warguments (const wchar_t *fmt0, va_list ap, union arg **argtable)
 {
 	wchar_t *fmt;		/* format string */
@@ -585,7 +551,6 @@
 		case 'e':
 		case 'E':
 		case 'f':
-		case 'F':
 		case 'g':
 		case 'G':
 			error = addtype(&types,
@@ -776,11 +741,6 @@
 			(*argtable) [n].longdoublearg = va_arg (ap, long double);
 #endif
 			break;
-#ifdef VECTORS
-		    case T_VECTOR:
-			(*argtable) [n].vectorarg = va_arg (ap, VECTORTYPE);
-			break;
-#endif /* VECTORS */
 		    case TP_CHAR:
 			(*argtable) [n].pchararg = va_arg (ap, char *);
 			break;