From 146b42e6d9c0d26688be221cb5707761e0273e47 Mon Sep 17 00:00:00 2001 From: Ross Lagerwall Date: Fri, 23 Oct 2015 10:56:11 +0100 Subject: [PATCH] Fix logging from common.c --- common.h | 4 ++-- create-diff-object.c | 3 +++ prelink.c | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/common.h b/common.h index b8369a5..d78275c 100644 --- a/common.h +++ b/common.h @@ -3,7 +3,7 @@ #include -static char *childobj; +extern char *childobj; #define ERROR(format, ...) \ error(1, 0, "ERROR: %s: %s: %d: " format, childobj, __FUNCTION__, __LINE__, ##__VA_ARGS__) @@ -38,7 +38,7 @@ enum loglevel { NORMAL }; -static enum loglevel loglevel = NORMAL; +extern enum loglevel loglevel; /******************* * Data structures diff --git a/create-diff-object.c b/create-diff-object.c index b3f7f9e..9a813eb 100644 --- a/create-diff-object.c +++ b/create-diff-object.c @@ -52,6 +52,9 @@ #include "asm/insn.h" #include "common.h" +char *childobj; +enum loglevel loglevel = NORMAL; + static void xsplice_compare_elf_headers(Elf *elf1, Elf *elf2) { GElf_Ehdr eh1, eh2; diff --git a/prelink.c b/prelink.c index 44cd6fc..f922871 100644 --- a/prelink.c +++ b/prelink.c @@ -36,6 +36,9 @@ #include "asm/insn.h" #include "common.h" +char *childobj; +enum loglevel loglevel = NORMAL; + /* Resolve symbols using xen-syms */ void xsplice_resolve_symbols(struct xsplice_elf *kelf, struct lookup_table *table) -- 2.39.5