openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 129e9dad: Merge changes Idfd1a114,If725a1cb,I61211165,If9a05ccb 

* commit '129e9dada707d66eb3242b666b6187a031dc410a':
  adb: turn on -Werror
  netcfg: turn on -Werror
  mkbootimg: turn on -Werror
  gpttool: turn on -Werror
This commit is contained in:
Mark Salyzyn 2014-05-07 23:12:57 +00:00 committed by Android Git Automerger
parent 1e6cd741fd 129e9dada7
commit 328746da80
13 changed files with 41 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
adb/Android.mk
View File

@ -74,7 +74,7 @@ else
LOCAL_SRC_FILES += fdevent.c
endif
LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter
LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter -Werror
LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
LOCAL_MODULE := adb
LOCAL_MODULE_TAGS := debug
@ -116,7 +116,7 @@ LOCAL_SRC_FILES := \
remount_service.c \
usb_linux_client.c
LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter
LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter -Werror
LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
@ -160,8 +160,7 @@ LOCAL_CFLAGS := \
-g \
-DADB_HOST=1 \
-DADB_HOST_ON_TARGET=1 \
-Wall \
-Wno-unused-parameter \
-Wall -Wno-unused-parameter -Werror \
-D_XOPEN_SOURCE \
-D_GNU_SOURCE

5
adb/backup_service.c
View File

@ -52,15 +52,12 @@ int backup_service(BackupOperation op, char* args) {
pid_t pid;
int s[2];
char* operation;
int socketnum;
// Command string and choice of stdin/stdout for the pipe depend on our invocation
// Command string depends on our invocation
if (op == BACKUP) {
operation = "backup";
socketnum = STDOUT_FILENO;
} else {
operation = "restore";
socketnum = STDIN_FILENO;
}
D("backup_service(%s, %s)\n", operation, args);

8
adb/commandline.c
View File

@ -406,7 +406,7 @@ int adb_download_buffer(const char *service, const char *fn, const void* data, i
}
int opt = CHUNK_SIZE;
opt = setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &opt, sizeof(opt));
opt = setsockopt(fd, SOL_SOCKET, SO_SNDBUF, (const void *) &opt, sizeof(opt));
total = sz;
ptr = data;
@ -681,10 +681,10 @@ static int logcat(transport_type transport, char* serial, int argc, char **argv)
return 0;
}
static int mkdirs(char *path)
static int mkdirs(const char *path)
{
int ret;
char *x = path + 1;
char *x = (char *)path + 1;
for(;;) {
x = adb_dirstart(x);
@ -727,7 +727,7 @@ static int backup(int argc, char** argv) {
if (argc < 2) return usage();
adb_unlink(filename);
mkdirs((char *)filename);
mkdirs(filename);
outFd = adb_creat(filename, 0640);
if (outFd < 0) {
fprintf(stderr, "adb: unable to open file %s\n", filename);

6
adb/file_sync_client.c
View File

@ -456,10 +456,10 @@ fail:
return -1;
}
static int mkdirs(char *name)
static int mkdirs(const char *name)
{
int ret;
char *x = name + 1;
char *x = (char *)name + 1;
for(;;) {
x = adb_dirstart(x);
@ -521,7 +521,7 @@ int sync_recv(int fd, const char *rpath, const char *lpath, int show_progress)
if((id == ID_DATA) || (id == ID_DONE)) {
adb_unlink(lpath);
mkdirs((char *)lpath);
mkdirs(lpath);
lfd = adb_creat(lpath, 0644);
if(lfd < 0) {
fprintf(stderr,"cannot create '%s': %s\n", lpath, strerror(errno));

15
adb/remount_service.c
View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
#include <sys/mount.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mount.h>
#include <unistd.h>
#include "sysdeps.h"
@ -35,7 +35,6 @@ static char *find_mount(const char *dir)
{
int fd;
int res;
int size;
char *token = NULL;
const char delims[] = "\n";
char buf[4096];
@ -45,7 +44,7 @@ static char *find_mount(const char *dir)
return NULL;
buf[sizeof(buf) - 1] = '\0';
size = adb_read(fd, buf, sizeof(buf) - 1);
adb_read(fd, buf, sizeof(buf) - 1);
adb_close(fd);
token = strtok(buf, delims);

4
adb/sysdeps_win32.c
View File

@ -956,7 +956,7 @@ bip_buffer_write( BipBuffer bip, const void* src, int len )
avail = len;
memcpy( bip->buff + bip->a_end, src, avail );
src += avail;
src = (const char *)src + avail;
count += avail;
len -= avail;
@ -1049,7 +1049,7 @@ bip_buffer_read( BipBuffer bip, void* dst, int len )
avail = len;
memcpy( dst, bip->buff + bip->a_start, avail );
dst += avail;
dst = (char *)dst + avail;
count += avail;
len -= avail;

4
adb/usb_windows.c
View File

@ -310,14 +310,14 @@ int usb_read(usb_handle *handle, void* data, int len) {
int xfer = (len > 4096) ? 4096 : len;
ret = AdbReadEndpointSync(handle->adb_read_pipe,
(void*)data,
data,
(unsigned long)xfer,
&read,
time_out);
int saved_errno = GetLastError();
D("usb_write got: %ld, expected: %d, errno: %d\n", read, xfer, saved_errno);
if (ret) {
data += read;
data = (char *)data + read;
len -= read;
if (len == 0)

1
gpttool/Android.mk
View File

@ -5,6 +5,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := gpttool.c
LOCAL_STATIC_LIBRARIES := libz
LOCAL_CFLAGS := -Werror
LOCAL_MODULE := gpttool

15
gpttool/gpttool.c
View File

@ -1,5 +1,4 @@
/* system/core/gpttool/gpttool.c
**
/*
** Copyright 2011, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
@ -15,18 +14,18 @@
** limitations under the License.
*/
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <unistd.h>
#include <zlib.h>
#include <linux/fs.h>
#include <sys/stat.h>
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;
@ -252,11 +251,9 @@ int parse_ptn(struct ptable *ptbl, char *x)
int main(int argc, char **argv)
{
struct ptable ptbl;
struct efi_entry *entry;
struct efi_header *hdr = &ptbl.header;
struct stat s;
u32 n;
u64 sz, blk;
u64 sz;
int fd;
const char *device;
int real_disk = 0;

1
mkbootimg/Android.mk
View File

@ -4,6 +4,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := mkbootimg.c
LOCAL_STATIC_LIBRARIES := libmincrypt
LOCAL_CFLAGS := -Werror
LOCAL_MODULE := mkbootimg

12
mkbootimg/mkbootimg.c
View File

@ -77,7 +77,7 @@ static unsigned char padding[16384] = { 0, };
int write_padding(int fd, unsigned pagesize, unsigned itemsize)
{
unsigned pagemask = pagesize - 1;
unsigned count;
ssize_t count;
if((itemsize & pagemask) == 0) {
return 0;
@ -108,7 +108,7 @@ int main(int argc, char **argv)
unsigned pagesize = 2048;
int fd;
SHA_CTX ctx;
uint8_t* sha;
const uint8_t* sha;
unsigned base = 0x10000000;
unsigned kernel_offset = 0x00008000;
unsigned ramdisk_offset = 0x01000000;
@ -189,7 +189,7 @@ int main(int argc, char **argv)
return usage();
}
strcpy(hdr.name, board);
strcpy((char *) hdr.name, board);
memcpy(hdr.magic, BOOT_MAGIC, BOOT_MAGIC_SIZE);
@ -255,14 +255,14 @@ int main(int argc, char **argv)
if(write(fd, &hdr, sizeof(hdr)) != sizeof(hdr)) goto fail;
if(write_padding(fd, pagesize, sizeof(hdr))) goto fail;
if(write(fd, kernel_data, hdr.kernel_size) != hdr.kernel_size) goto fail;
if(write(fd, kernel_data, hdr.kernel_size) != (ssize_t) hdr.kernel_size) goto fail;
if(write_padding(fd, pagesize, hdr.kernel_size)) goto fail;
if(write(fd, ramdisk_data, hdr.ramdisk_size) != hdr.ramdisk_size) goto fail;
if(write(fd, ramdisk_data, hdr.ramdisk_size) != (ssize_t) hdr.ramdisk_size) goto fail;
if(write_padding(fd, pagesize, hdr.ramdisk_size)) goto fail;
if(second_data) {
if(write(fd, second_data, hdr.second_size) != hdr.second_size) goto fail;
if(write(fd, second_data, hdr.second_size) != (ssize_t) hdr.second_size) goto fail;
if(write_padding(fd, pagesize, hdr.second_size)) goto fail;
}

1
netcfg/Android.mk
View File

@ -11,6 +11,7 @@ LOCAL_MODULE:= netcfg
#LOCAL_STATIC_LIBRARIES := libcutils libc
LOCAL_SHARED_LIBRARIES := libc libnetutils
LOCAL_CFLAGS := -Werror
include $(BUILD_EXECUTABLE)
endif

13
netcfg/netcfg.c
View File

@ -1,5 +1,4 @@
/* system/bin/netcfg/netcfg.c
**
/*
** Copyright 2006, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
@ -15,18 +14,14 @@
** limitations under the License.
*/
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <dirent.h>
#include <netinet/ether.h>
#include <netinet/if_ether.h>
#include <netutils/ifc.h>
#include <netutils/dhcp.h>
static int verbose = 0;
#include <netutils/ifc.h>
#include <stdio.h>
#include <stdlib.h>
void die(const char *reason)
{