libpayload: avoid excessive casts in printf.c

[coreboot.git] / payloads / libpayload / libc / printf.c

diff --git a/payloads/libpayload/libc/printf.c b/payloads/libpayload/libc/printf.c
index e3cf8bbb24ca2224879ac96ff3da8add9f0a0548..ccb64fd67833a2f48d2d452c1c51941281f46d82 100644 (file)
--- a/payloads/libpayload/libc/printf.c
+++ b/payloads/libpayload/libc/printf.c
@@ -46,7 +46,7 @@ FILE *stderr = &_stderr;
 /** Structure for specifying output methods for different printf clones. */
 struct printf_spec {
        /* Output function, returns count of printed characters or EOF. */
-       int (*write) (void *, size_t, void *);
+       int (*write) (const char *, size_t, void *);
        /* Support data - output stream specification, its state, locks, ... */
        void *data;
 };
@@ -85,8 +85,8 @@ typedef enum {
        PrintfQualifierPointer,
 } qualifier_t;
 
-static char digits_small[] = "0123456789abcdef";
-static char digits_big[] = "0123456789ABCDEF";
+static const char digits_small[] = "0123456789abcdef";
+static const char digits_big[] = "0123456789ABCDEF";
 
 /**
  * Print one or more characters without adding newline.
@@ -99,7 +99,7 @@ static char digits_big[] = "0123456789ABCDEF";
 static int printf_putnchars(const char *buf, size_t count,
                            struct printf_spec *ps)
 {
-       return ps->write((void *)buf, count, ps->data);
+       return ps->write(buf, count, ps->data);
 }
 
 /**
@@ -109,18 +109,9 @@ static int printf_putnchars(const char *buf, size_t count,
  * @param ps   Write function specification and support data.
  * @return     Number of characters printed.
  */
-static int printf_putstr(const char *str, struct printf_spec *ps)
+static inline int printf_putstr(const char *str, struct printf_spec *ps)
 {
-       size_t count;
-
-       if (str == NULL) {
-               const char *nullstr = "(NULL)";
-               return printf_putnchars(nullstr, strlen(nullstr), ps);
-       }
-
-       count = strlen(str);
-
-       return ps->write((void *)str, count, ps->data);
+       return printf_putnchars(str, strlen(str), ps);
 }
 
 /**
@@ -132,9 +123,9 @@ static int printf_putstr(const char *str, struct printf_spec *ps)
  */
 static int printf_putchar(int c, struct printf_spec *ps)
 {
-       unsigned char ch = c;
+       char ch = c;
 
-       return ps->write((void *)&ch, 1, ps->data);
+       return ps->write(&ch, 1, ps->data);
 }
 
 /**
@@ -228,7 +219,7 @@ static int print_string(char *s, int width, unsigned int precision,
 static int print_number(uint64_t num, int width, int precision, int base,
                        uint64_t flags, struct printf_spec *ps)
 {
-       char *digits = digits_small;
+       const char *digits = digits_small;
        char d[PRINT_NUMBER_BUFFER_SIZE];
        char *ptr = &d[PRINT_NUMBER_BUFFER_SIZE - 1];
        int size = 0;           /* Size of number with all prefixes and signs. */
@@ -761,13 +752,13 @@ struct vsnprintf_data {
  *
  * @param str  Source string to print.
  * @param count        Size of source string.
- * @param data Structure with destination string, counter of used space
+ * @param _data        Structure with destination string, counter of used space
  *              and total string size.
  * @return Number of characters to print (not characters really printed!).
  */
-static int vsnprintf_write(const char *str, size_t count,
-                          struct vsnprintf_data *data)
+static int vsnprintf_write(const char *str, size_t count, void *_data)
 {
+       struct vsnprintf_data *data = _data;
        size_t i;
 
        i = data->size - data->len;
@@ -807,8 +798,7 @@ static int vsnprintf_write(const char *str, size_t count,
 int vsnprintf(char *str, size_t size, const char *fmt, va_list ap)
 {
        struct vsnprintf_data data = { size, 0, str };
-       struct printf_spec ps =
-           { (int (*)(void *, size_t, void *))vsnprintf_write, &data };
+       struct printf_spec ps = { vsnprintf_write, &data };
 
        /* Print 0 at end of string - fix case that nothing will be printed. */
        if (size > 0)
@@ -847,8 +837,7 @@ static int vprintf_write(const char *str, size_t count, void *unused)
 
 int vprintf(const char *fmt, va_list ap)
 {
-       struct printf_spec ps =
-           { (int (*)(void *, size_t, void *))vprintf_write, NULL };
+       struct printf_spec ps = { vprintf_write, NULL };
 
        return printf_core(fmt, &ps, ap);
 }