From a80a0442fd397fc6aa4f3b2d8537c0cabb857e4b Mon Sep 17 00:00:00 2001 From: Sebastian Schmelzer Date: Tue, 6 Sep 2011 17:38:27 +0200 Subject: fix compile errors --- LogReceiver/logreceiver.cpp | 5 +++-- customdhcpcd/src/logwriter.c | 21 +++++++++++++++++---- customdhcpcd/src/logwriter.h | 2 +- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/LogReceiver/logreceiver.cpp b/LogReceiver/logreceiver.cpp index 66c65e5..8dc2938 100644 --- a/LogReceiver/logreceiver.cpp +++ b/LogReceiver/logreceiver.cpp @@ -269,8 +269,8 @@ void LogReceiver::checkConnectivity(QString ifName) { } void LogReceiver::checkInternetConnectionViaTCP(QString ifName) { - - const bool canStartIAP = (configurationManager.capabilities() +/* + bool canStartIAP = (configurationManager.capabilities() & QNetworkConfigurationManager::CanStartAndStopInterfaces); QList configs = configurationManager.allConfigurations(); @@ -307,6 +307,7 @@ void LogReceiver::checkInternetConnectionViaTCP(QString ifName) { qDebug() << "couldn't open session"; } session->close(); + */ } /** diff --git a/customdhcpcd/src/logwriter.c b/customdhcpcd/src/logwriter.c index 0a78995..d41bbfb 100644 --- a/customdhcpcd/src/logwriter.c +++ b/customdhcpcd/src/logwriter.c @@ -151,10 +151,23 @@ void logSendToQt(int type) { } } -void logLoggerToQt(int level, const char *fmt, va_list args) { - vsnprintf(mesg, sizeof(mesg), fmt, args); - strcat(mesg, "\n"); - logToQt(level, DHCPCD_LOG, mesg); +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) diff --git a/customdhcpcd/src/logwriter.h b/customdhcpcd/src/logwriter.h index 7e41411..43f35fa 100644 --- a/customdhcpcd/src/logwriter.h +++ b/customdhcpcd/src/logwriter.h @@ -33,7 +33,7 @@ void closeQtLoggerSocket (); void sendToQt (); void logToQt(int status, int substatus, const char * msg); void logSendToQt(int type); -void logLoggerToQt(int level, const char *fmt, va_list args); +void logLoggerToQt(int level, const char *fmt, ...); //void logToQt(char * status, char * substatus, char * msg); void logGatewayToFile(const interface_t *iface, const dhcp_t *dhcp); -- cgit v1.2.3-55-g7522