mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 18:21:39 +01:00
Ian Campbell
3bd852f207
No changes required to sparse tree or patches directory. Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
60 lines
1.7 KiB
Diff
60 lines
1.7 KiB
Diff
commit e905914f96e11862b130dd229f73045dad9a34e8
|
|
Author: Jeremy Fitzhardinge <jeremy@xensource.com>
|
|
Date: Sun Jun 25 05:49:17 2006 -0700
|
|
|
|
[PATCH] Implement kasprintf
|
|
|
|
Implement kasprintf, a kernel version of asprintf. This allocates the
|
|
memory required for the formatted string, including the trailing '\0'.
|
|
Returns NULL on allocation failure.
|
|
|
|
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
|
|
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
|
|
Signed-off-by: Andrew Morton <akpm@osdl.org>
|
|
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|
|
|
|
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
|
|
index 8c21aaa..3c5e4c2 100644
|
|
--- a/include/linux/kernel.h
|
|
+++ b/include/linux/kernel.h
|
|
@@ -117,6 +117,8 @@ extern int scnprintf(char * buf, size_t
|
|
__attribute__ ((format (printf, 3, 4)));
|
|
extern int vscnprintf(char *buf, size_t size, const char *fmt, va_list args)
|
|
__attribute__ ((format (printf, 3, 0)));
|
|
+extern char *kasprintf(gfp_t gfp, const char *fmt, ...)
|
|
+ __attribute__ ((format (printf, 2, 3)));
|
|
|
|
extern int sscanf(const char *, const char *, ...)
|
|
__attribute__ ((format (scanf, 2, 3)));
|
|
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
|
|
index f595947..797428a 100644
|
|
--- a/lib/vsprintf.c
|
|
+++ b/lib/vsprintf.c
|
|
@@ -849,3 +849,26 @@ int sscanf(const char * buf, const char
|
|
}
|
|
|
|
EXPORT_SYMBOL(sscanf);
|
|
+
|
|
+
|
|
+/* Simplified asprintf. */
|
|
+char *kasprintf(gfp_t gfp, const char *fmt, ...)
|
|
+{
|
|
+ va_list ap;
|
|
+ unsigned int len;
|
|
+ char *p;
|
|
+
|
|
+ va_start(ap, fmt);
|
|
+ len = vsnprintf(NULL, 0, fmt, ap);
|
|
+ va_end(ap);
|
|
+
|
|
+ p = kmalloc(len+1, gfp);
|
|
+ if (!p)
|
|
+ return NULL;
|
|
+ va_start(ap, fmt);
|
|
+ vsnprintf(p, len+1, fmt, ap);
|
|
+ va_end(ap);
|
|
+ return p;
|
|
+}
|
|
+
|
|
+EXPORT_SYMBOL(kasprintf);
|