discover: Use pxeconffile for udhcpc option name

[petitboot] / discover / params.c

diff --git a/discover/params.c b/discover/params.c
index 76a14514912804a829d4c2769c6dfed745179192..09c2b0f640a12b6d8c641fb45b64389ae8f83d41 100644 (file)
--- a/discover/params.c
+++ b/discover/params.c
@@ -22,29 +22,29 @@
 #include <ctype.h>
 #include <errno.h>
 
 #include <ctype.h>
 #include <errno.h>
 

+#include <log/log.h>
+

 #include "params.h"
 
 #define new_array(type, num) ((type *)_new_array(sizeof(type), (num)))
 #define realloc_array(ptr, type, num) \
        ((type *)_realloc_array((ptr), sizeof(type), (num)))
 
 #include "params.h"
 
 #define new_array(type, num) ((type *)_new_array(sizeof(type), (num)))
 #define realloc_array(ptr, type, num) \
        ((type *)_realloc_array((ptr), sizeof(type), (num)))
 

-#define rprintf(x, ...) do { fprintf(stderr, ##__VA_ARGS__);   \
-                               fprintf(stderr, "\n"); } while (0)
-#define rsyserr(x, y, ...) do { fprintf(stderr, ##__VA_ARGS__);        \
-                               fprintf(stderr, "\n"); } while (0)
+#define rprintf(x, ...) do {pb_log(__VA_ARGS__); pb_log("\n");} while (0)
+#define rsyserr(x, y, ...) do {pb_log(__VA_ARGS__); pb_log("\n");} while (0)

 
 #define MALLOC_MAX 0x40000000
 #define False 0
 #define True 1
 
 
 #define MALLOC_MAX 0x40000000
 #define False 0
 #define True 1
 

-void *_new_array(unsigned int size, unsigned long num)
+static void *_new_array(unsigned int size, unsigned long num)

 {
        if (num >= MALLOC_MAX/size)
                return NULL;
        return malloc(size * num);
 }
 
 {
        if (num >= MALLOC_MAX/size)
                return NULL;
        return malloc(size * num);
 }
 

-void *_realloc_array(void *ptr, unsigned int size, unsigned long num)
+static void *_realloc_array(void *ptr, unsigned int size, unsigned long num)

 {
        if (num >= MALLOC_MAX/size)
                return NULL;
 {
        if (num >= MALLOC_MAX/size)
                return NULL;