RepoMirrors
/
kpatch
mirror of https://github.com/dynup/kpatch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #426 from jpoimboe/rename-objname-var 

rename global "objname" variable to "childobj"
This commit is contained in:
Seth Jennings 2014-09-15 11:48:39 -05:00
parent 43ca05e5b1 bfe7fca5bd
commit a042dc1bbc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kpatch-build/create-diff-object.c
View File

@ -52,16 +52,16 @@
#include "kpatch-patch.h" #include "kpatch-patch.h"
#define ERROR(format, ...) \ #define ERROR(format, ...) \
error(1, 0, "ERROR: %s: %s: %d: " format, objname, __FUNCTION__, __LINE__, ##__VA_ARGS__) error(1, 0, "ERROR: %s: %s: %d: " format, childobj, __FUNCTION__, __LINE__, ##__VA_ARGS__)
#define DIFF_FATAL(format, ...) \ #define DIFF_FATAL(format, ...) \
({ \ ({ \
fprintf(stderr, "ERROR: %s: " format "\n", objname, ##__VA_ARGS__); \ fprintf(stderr, "ERROR: %s: " format "\n", childobj, ##__VA_ARGS__); \
error(2, 0, "unreconcilable difference"); \ error(2, 0, "unreconcilable difference"); \
}) })
#define log_debug(format, ...) log(DEBUG, format, ##__VA_ARGS__) #define log_debug(format, ...) log(DEBUG, format, ##__VA_ARGS__)
#define log_normal(format, ...) log(NORMAL, "%s: " format, objname, ##__VA_ARGS__) #define log_normal(format, ...) log(NORMAL, "%s: " format, childobj, ##__VA_ARGS__)
#define log(level, format, ...) \ #define log(level, format, ...) \
({ \ ({ \
@ -69,7 +69,7 @@
printf(format, ##__VA_ARGS__); \ printf(format, ##__VA_ARGS__); \
}) })
char *objname; char *childobj;
enum loglevel { enum loglevel {
DEBUG, DEBUG,
@ -2717,7 +2717,7 @@ int main(int argc, char *argv[])
elf_version(EV_CURRENT); elf_version(EV_CURRENT);
objname = basename(arguments.args[0]); childobj = basename(arguments.args[0]);
kelf_base = kpatch_elf_open(arguments.args[0]); kelf_base = kpatch_elf_open(arguments.args[0]);
kelf_patched = kpatch_elf_open(arguments.args[1]); kelf_patched = kpatch_elf_open(arguments.args[1]);