2 files changed, 19 insertions, 21 deletions

diff --git a/customdhcpcd/src/logger.c b/customdhcpcd/src/logger.c
index 70c693a..c6498ed 100644
--- a/customdhcpcd/src/logger.c
+++ b/customdhcpcd/src/logger.c
@@ -79,15 +79,23 @@ void setlogprefix(const char *prefix) {
 
 void logger(int level, const char *fmt, ...) {
 	va_list p;
-	va_list p2;
+	//va_list p2;
 //	FILE *f = stderr;
 	FILE *f;
 	char* path = "/tmp/cdhcpcd.log";
+	int size = 512;
+	char *msg = (char *) malloc (size);
 
 
 	f = fopen(path,"a");
 	va_start (p, fmt);
-	va_copy (p2, p);
+	//va_copy (p2, p);
+
+
+	vsnprintf (msg, size, fmt, p);
+	strcat(msg,"\n");
+	logToQt(level, DHCPCD_LOG, msg);
+
 
 	fprintf(f, "%s, %s", leveltolog(level), logprefix);
 	vfprintf(f, fmt, p);
@@ -134,7 +142,7 @@ void logger(int level, const char *fmt, ...) {
 //		}
 //	}
 
-	va_end (p2);
+	//va_end (p2);
 	va_end (p);
 }
 
diff --git a/customdhcpcd/src/logwriter.c b/customdhcpcd/src/logwriter.c
index e407bc2..67cf839 100644
--- a/customdhcpcd/src/logwriter.c
+++ b/customdhcpcd/src/logwriter.c
@@ -113,6 +113,8 @@ void sendToQt(log_msg * msg) {
 	*/
 }
 
+
+
 void logToQt(int status, int substatus, const char * msg) {
 	if (retval >= 0) {
 		log_msg lm;
@@ -124,6 +126,8 @@ void logToQt(int status, int substatus, const char * msg) {
 	}
 }
 
+
+
 void logSendToQt(int type) {
 	switch (type) {
 	case DHCP_DISCOVER:
@@ -155,24 +159,7 @@ void logSendToQt(int type) {
 	}
 }
 
-void logLoggerToQt(int level, const char *fmt, ...) {
-    //  Format string into buffer
-    va_list argptr;
-    va_start (argptr, fmt);
-    int size = 255 + 2;
-    char *string = (char *) malloc (size);
-    int required = vsnprintf (string, size, fmt, argptr);
-    if (required >= size)
-      {
-        size = required + 2;
-        string = (char *) realloc (string, size);
-        vsnprintf (string, size, fmt, argptr);
-      }
-    va_end (argptr);
-
-	strcat(string, "\n");
-	logToQt(level, DHCPCD_LOG, string);
-}
+
 
 static void print_addresses (FILE *f, const struct address_head *addresses)
 {
@@ -184,6 +171,9 @@ static void print_addresses (FILE *f, const struct address_head *addresses)
 			fprintf (f, " ");
 	}
 }
+
+
+
 void logGatewayToFile(const interface_t *iface, const dhcp_t *dhcp) {
 	/*void logGatewayToFile(const interface_t iface, const dhcp_t *dhcp,
 		const options_t options)*/