From a40e5a3711b0b696e077e62a2fa5076d8a1c7e4e Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 22 May 2008 07:37:17 +0000 Subject: [PATCH] some more static keywords --- src/Jamrules | 5 +++++ src/common/kernel/binarystore.c | 4 ++-- src/common/kernel/textstore.c | 10 +++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/Jamrules b/src/Jamrules index a6344b7d7..2bffa5687 100644 --- a/src/Jamrules +++ b/src/Jamrules @@ -93,6 +93,11 @@ rule iconv } } +rule zlib +{ + LINKLIBS on $(<) += -lz ; +} + rule luabind { LINKLIBS on $(<) += -L$(LUABIND_ROOT)/lib ; diff --git a/src/common/kernel/binarystore.c b/src/common/kernel/binarystore.c index c34b4d3ef..88c861c64 100644 --- a/src/common/kernel/binarystore.c +++ b/src/common/kernel/binarystore.c @@ -190,7 +190,7 @@ bin_r_str_buf(struct storage * store, char * result, size_t size) } } -int +static int bin_open(struct storage * store, const char * filename, int mode) { const char * modes[] = { 0, "rb", "wb", "ab" }; @@ -216,7 +216,7 @@ bin_open(struct storage * store, const char * filename, int mode) return (F==NULL); } -int +static int bin_close(struct storage * store) { return fclose(file(store)); diff --git a/src/common/kernel/textstore.c b/src/common/kernel/textstore.c index 0314d323e..282be5c64 100644 --- a/src/common/kernel/textstore.c +++ b/src/common/kernel/textstore.c @@ -111,7 +111,7 @@ txt_r_tok_buf(struct storage * store, char * result, size_t size) } } -int +static int txt_w_str(struct storage * store, const char * str) { int result = fwritestr((FILE *)store->userdata, str); @@ -119,7 +119,7 @@ txt_w_str(struct storage * store, const char * str) return result+1; } -char * +static char * txt_r_str(struct storage * store) { char buffer[DISPLAYSIZE]; @@ -128,13 +128,13 @@ txt_r_str(struct storage * store) return strdup(buffer); } -void +static void txt_r_str_buf(struct storage * store, char * result, size_t size) { freadstr((FILE *)store->userdata, store->encoding, result, size); } -int +static int txt_open(struct storage * store, const char * filename, int mode) { const char * modes[] = { 0, "rt", "wt", "at" }; @@ -167,7 +167,7 @@ txt_open(struct storage * store, const char * filename, int mode) return (F==NULL); } -int +static int txt_close(struct storage * store) { return fclose((FILE *)store->userdata);