diff options
author | Vincent Sanders <vince@kyllikki.org> | 2015-05-28 16:08:46 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2015-05-28 16:08:46 +0100 |
commit | c105738fa36bb2400adc47399c5b878d252d1c86 (patch) | |
tree | 138eeb449e1bf51ee1726b5f820740aada0ccd0b /cocoa | |
parent | 20f2c86a511f7913cf858e7bd3668b0b59663ba0 (diff) | |
download | netsurf-c105738fa36bb2400adc47399c5b878d252d1c86.tar.gz netsurf-c105738fa36bb2400adc47399c5b878d252d1c86.tar.bz2 |
Change LOG() macro to be varadic
This changes the LOG macro to be varadic removing the need for all
callsites to have double bracketing and allows for future improvement
on how we use the logging macros.
The callsites were changed with coccinelle and the changes checked by
hand. Compile tested for several frontends but not all.
A formatting annotation has also been added which allows the compiler
to check the parameters and types passed to the logging.
Diffstat (limited to 'cocoa')
-rw-r--r-- | cocoa/DownloadWindowController.m | 2 | ||||
-rw-r--r-- | cocoa/fetch.m | 10 | ||||
-rw-r--r-- | cocoa/plotter.m | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/cocoa/DownloadWindowController.m b/cocoa/DownloadWindowController.m index e9a13e631..df57b379a 100644 --- a/cocoa/DownloadWindowController.m +++ b/cocoa/DownloadWindowController.m @@ -112,7 +112,7 @@ static void cocoa_register_download( DownloadWindowController *download ); (NSString *)kLSQuarantineTypeWebDownload, (NSString *)kLSQuarantineTypeKey, nil]; LSSetItemAttribute( &ref, kLSRolesAll, kLSItemQuarantineProperties, (CFDictionaryRef)attributes ); - LOG(("Set quarantine attributes on file %s", [path UTF8String])); + LOG("Set quarantine attributes on file %s", [path UTF8String]); } [self setOutputFile: [NSFileHandle fileHandleForWritingAtPath: path]]; diff --git a/cocoa/fetch.m b/cocoa/fetch.m index 278b80134..1c36bb8a5 100644 --- a/cocoa/fetch.m +++ b/cocoa/fetch.m @@ -51,13 +51,13 @@ static const char *fetch_filetype(const char *unix_path) uti = [[NSWorkspace sharedWorkspace] typeOfFile: [NSString stringWithUTF8String: unix_path] error:&utiError]; if (nil != uti) { - LOG(("Looking for mimetype from uti \"%s\"", [uti UTF8String] )); + LOG("Looking for mimetype from uti \"%s\"", [uti UTF8String] ); mimeType = (NSString *)UTTypeCopyPreferredTagWithClass( (CFStringRef)uti, kUTTagClassMIMEType ); } else { NSAlert *utiAlert = [NSAlert alertWithError:utiError]; [utiAlert runModal]; // Ignore return value. - LOG(("uti call failed")); + LOG("uti call failed"); strncpy(cocoafiletype, "text/html", sizeof(cocoafiletype)); return cocoafiletype; @@ -69,13 +69,13 @@ static const char *fetch_filetype(const char *unix_path) } else { const char *extension; - LOG(("mimetype from uti failed")); + LOG("mimetype from uti failed"); extension = [(NSString *)UTTypeCopyPreferredTagWithClass( (CFStringRef)uti, kUTTagClassFilenameExtension) UTF8String]; if (extension == NULL) { /* give up and go with default */ - LOG(("No extension going with default type")); + LOG("No extension going with default type"); strncpy(cocoafiletype, "text/html", sizeof(cocoafiletype)); } else { int eidx = 0; /* index of extension entry */ @@ -90,7 +90,7 @@ static const char *fetch_filetype(const char *unix_path) } } - LOG(( "\tMIME type for '%s' is '%s'", unix_path, cocoafiletype )); + LOG("\tMIME type for '%s' is '%s'", unix_path, cocoafiletype); return cocoafiletype; } diff --git a/cocoa/plotter.m b/cocoa/plotter.m index 61f53c192..dbc9460c4 100644 --- a/cocoa/plotter.m +++ b/cocoa/plotter.m @@ -201,7 +201,7 @@ static bool plot_path(const float *p, unsigned int n, colour fill, float width, if (n == 0) return true; if (*p != PLOTTER_PATH_MOVE) { - LOG(("Path does not start with move")); + LOG("Path does not start with move"); return false; } @@ -236,7 +236,7 @@ static bool plot_path(const float *p, unsigned int n, colour fill, float width, break; default: - LOG(("Invalid path")); + LOG("Invalid path"); return false; } } |