From 1197f761a42798cb66426ef444c7f0e4f699a4f6 Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Thu, 26 Jan 2012 19:05:31 +0000 Subject: Fix several clang warnings in breakpad. uploader.mm:549:5: warning: instance method '-uploadData:name:url:' not found (return type defaults to 'id') [self uploadData:logFileData_ name:@"log" url:url]; => it looks like this method does in fact not exist, the last parameter needs to be removed. breakpad_nlist_64.cc:193:59: warning: '&&' within '||' [-Wlogical-op-parentheses] => Just add parentheses, no functionality change. Patch by Nico Weber BUG=none TEST=breakpad stil works. git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@907 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/client/mac/handler/breakpad_nlist_64.cc | 6 +++--- src/client/mac/sender/uploader.mm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/client/mac/handler/breakpad_nlist_64.cc b/src/client/mac/handler/breakpad_nlist_64.cc index 4d9bbcc7..f00be081 100644 --- a/src/client/mac/handler/breakpad_nlist_64.cc +++ b/src/client/mac/handler/breakpad_nlist_64.cc @@ -190,9 +190,9 @@ int __breakpad_fdnlist(int fd, nlist_type *list, const char **symbolNames, struct exec buf; if (read(fd, (char *)&buf, sizeof(buf)) != sizeof(buf) || (N_BADMAG(buf) && *((uint32_t *)&buf) != magic && - NXSwapBigLongToHost(*((long *)&buf)) != FAT_MAGIC) && - /* The following is the big-endian ppc64 check */ - (*((uint32_t*)&buf)) != FAT_MAGIC) { + NXSwapBigLongToHost(*((long *)&buf)) != FAT_MAGIC && + /* The following is the big-endian ppc64 check */ + (*((uint32_t*)&buf)) != FAT_MAGIC)) { return -1; } diff --git a/src/client/mac/sender/uploader.mm b/src/client/mac/sender/uploader.mm index 7f4b2d3c..7298ed42 100644 --- a/src/client/mac/sender/uploader.mm +++ b/src/client/mac/sender/uploader.mm @@ -546,7 +546,7 @@ NSDictionary *readConfigurationData(const char *configFile) { } if (logFileData_) { - [self uploadData:logFileData_ name:@"log" url:url]; + [self uploadData:logFileData_ name:@"log"]; } [upload release]; -- cgit v1.2.1