summaryrefslogtreecommitdiff
path: root/testing/logrotate/logrotate-3.8.1-noasprintf.patch
blob: be0c08062817497f2941d398856f6f321a122c34 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
--- logrotate-3.8.0.orig/config.c	2011-06-21 04:12:02.000000000 -0400
+++ logrotate-3.8.0/config.c	2011-07-12 13:47:36.274319050 -0400
@@ -41,39 +41,6 @@
 #include "asprintf.c"
 #endif
 
-#if !defined(asprintf)
-#include <stdarg.h>
-
-int asprintf(char **string_ptr, const char *format, ...)
-{
-	va_list arg;
-	char *str;
-	int size;
-	int rv;
-
-	va_start(arg, format);
-	size = vsnprintf(NULL, 0, format, arg);
-	size++;
-	va_start(arg, format);
-	str = malloc(size);
-	if (str == NULL) {
-		va_end(arg);
-		/*
-		 * Strictly speaking, GNU asprintf doesn't do this,
-		 * but the caller isn't checking the return value.
-		 */
-		fprintf(stderr, "failed to allocate memory\\n");
-		exit(1);
-	}
-	rv = vsnprintf(str, size, format, arg);
-	va_end(arg);
-
-	*string_ptr = str;
-	return (rv);
-}
-
-#endif
-
 #if !defined(strndup)
 char *strndup(const char *s, size_t n)
 {
--- logrotate-3.8.0.orig/logrotate.h	2011-06-21 04:12:02.000000000 -0400
+++ logrotate-3.8.0/logrotate.h	2011-07-12 13:47:38.949285608 -0400
@@ -66,8 +66,5 @@ extern int numLogs;
 extern int debug;
 
 int readAllConfigPaths(const char **paths);
-#if !defined(asprintf)
-int asprintf(char **string_ptr, const char *format, ...);
-#endif
 
 #endif