commit c095811500dd4965c207ec018df7a74a06946a6b Author: Zack Weinberg zackw@panix.com Date: Wed Feb 29 17:31:08 2012 -0800

Fix audit-globals.sh for GNU nm. Make 3 variables file-local. --- src/audit-globals.sh | 8 +++++--- src/steg/payloads.cc | 8 +++----- 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/audit-globals.sh b/src/audit-globals.sh index cc2387b..dbff414 100644 --- a/src/audit-globals.sh +++ b/src/audit-globals.sh @@ -16,8 +16,8 @@ sed ' / [DBdb] /!d

s/^src/// - s/.o: / / - s/.obj: / / + s/.o: */ / + s/.obj: */ / s/ [0-9a-fA-F][0-9a-fA-F]* [DBdb] / /

# This is the whitelist, in the form of a bunch of sed "d" commands. @@ -51,7 +51,9 @@ sed ' /^steg/http has_peer_name$/d /^steg/http peername$/d /^steg/http std::__ioinit$/d - /^steg/payloads _payload_count$/d + /^steg/payloads payload_count$/d + /^steg/payloads payload_hdrs$/d + /^steg/payloads payloads$/d /^steg/payloads initTypePayload$/d /^steg/payloads max_HTML_capacity$/d /^steg/payloads max_JS_capacity$/d diff --git a/src/steg/payloads.cc b/src/steg/payloads.cc index 250f149..c7e2638 100644 --- a/src/steg/payloads.cc +++ b/src/steg/payloads.cc @@ -15,11 +15,9 @@ static unsigned int max_JS_capacity = 0; static unsigned int max_HTML_capacity = 0; static unsigned int max_PDF_capacity = 0;

- - -pentry_header payload_hdrs[MAX_PAYLOADS]; -char* payloads[MAX_PAYLOADS]; -int payload_count = 0; +static pentry_header payload_hdrs[MAX_PAYLOADS]; +static char* payloads[MAX_PAYLOADS]; +static int payload_count = 0;

unsigned int get_max_JS_capacity() {