ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adb: tag fatal, fatal_errno with printf attribute."

Browse source
This commit is contained in:
Josh Gao 2016-01-15 23:51:05 +00:00 • committed by Gerrit Code Review
commit 7db2cb67be
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
adb/adb.h
View file

@ -142,10 +142,10 @@ struct alistener
void print_packet(const char *label, apacket *p); void print_packet(const char *label, apacket *p);
// These use the system (v)fprintf, not the adb prefixed ones defined in sysdeps.h, so they
// shouldn't be tagged with ADB_FORMAT_ARCHETYPE.
void fatal(const char *fmt, ...) __attribute__((noreturn)); void fatal(const char* fmt, ...) __attribute__((noreturn, format(__printf__, 1, 2)));
void fatal_errno(const char *fmt, ...) __attribute__((noreturn)); void fatal_errno(const char* fmt, ...) __attribute__((noreturn, format(__printf__, 1, 2)));
void handle_packet(apacket *p, atransport *t); void handle_packet(apacket *p, atransport *t);

7
adb/sysdeps_win32.cpp
View file

@ -88,7 +88,10 @@ static const FHClassRec _fh_socket_class = {
_fh_socket_hook _fh_socket_hook
}; };
#define assert(cond) do { if (!(cond)) fatal( "assertion failed '%s' on %s:%ld\n", #cond, __FILE__, __LINE__ ); } while (0) #define assert(cond) \
do { \
if (!(cond)) fatal("assertion failed '%s' on %s:%d\n", #cond, __FILE__, __LINE__); \
} while (0)
std::string SystemErrorCodeToString(const DWORD error_code) { std::string SystemErrorCodeToString(const DWORD error_code) {
const int kErrorMessageBufferSize = 256; const int kErrorMessageBufferSize = 256;
@ -1589,7 +1592,7 @@ int adb_socketpair(int sv[2]) {
/**************************************************************************/ /**************************************************************************/
/**************************************************************************/ /**************************************************************************/
#define FATAL(x...) fatal(__FUNCTION__, x) #define FATAL(fmt, ...) fatal("%s: " fmt, __FUNCTION__, ##__VA_ARGS__)
#if DEBUG #if DEBUG
static void dump_fde(fdevent *fde, const char *info) static void dump_fde(fdevent *fde, const char *info)