projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: device-tree-bindings: add TIS TPMv2.0 SPI module info
[oweals/u-boot.git]
/
lib
/
vsprintf.c
diff --git
a/lib/vsprintf.c
b/lib/vsprintf.c
index 226f4eb3e5125878200fbeb1109d3ab24e41e260..8514f504988ea94119d8774c130ecdbfc5247e67 100644
(file)
--- a/
lib/vsprintf.c
+++ b/
lib/vsprintf.c
@@
-300,8
+300,9
@@
static char *device_path_string(char *buf, char *end, void *dp, int field_width,
{
u16 *str;
{
u16 *str;
+ /* If dp == NULL output the string '<NULL>' */
if (!dp)
if (!dp)
- return
"<NULL>"
;
+ return
string16(buf, end, dp, field_width, precision, flags)
;
str = efi_dp_str((struct efi_device_path *)dp);
if (!str)
str = efi_dp_str((struct efi_device_path *)dp);
if (!str)
@@
-782,6
+783,7
@@
int sprintf(char *buf, const char *fmt, ...)
return i;
}
return i;
}
+#if CONFIG_IS_ENABLED(PRINTF)
int printf(const char *fmt, ...)
{
va_list args;
int printf(const char *fmt, ...)
{
va_list args;
@@
-823,15
+825,7
@@
int vprintf(const char *fmt, va_list args)
puts(printbuffer);
return i;
}
puts(printbuffer);
return i;
}
-
-
-void __assert_fail(const char *assertion, const char *file, unsigned line,
- const char *function)
-{
- /* This will not return */
- panic("%s:%u: %s: Assertion `%s' failed.", file, line, function,
- assertion);
-}
+#endif
char *simple_itoa(ulong i)
{
char *simple_itoa(ulong i)
{