From fab88997b021ad66dd7f03220d95d1f7ee315140 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 29 Oct 2001 08:12:44 +0000 Subject: [PATCH] This patch applied, except without the structure changes to nmblib.c Andrew Bartlett. From kai@cmail.ru Mon Oct 29 18:50:42 2001 Date: Fri, 19 Oct 2001 17:26:06 +0300 From: Andrew V. Samoilov To: samba-technical@lists.samba.org Subject: [patch]: makes some arrays const to be shared between processes Hi! This patch makes some arrays const. So these arrays go to text/rodata segment and are shared between all of the processes which use shared library with these arrays. Regards, Andrew V. Samoilov. P.S. Please cc your answer to kai@cmail.ru, I don't subscribed to this list. ChangeLog: * cliconnect.c (prots): Make const. * clierror.c (rap_errmap): Likewise. * nmblib.c (nmb_header_opcode_names): Likewise. (lookup_opcode_name): Make opcode_namep const. Eliminate i. * nterr.c (nt_err_code_struct): Typedef const. * smberr.c (err_code_struct): Make const. (err_classes): Likewise. (This used to be commit cb84485a2b0e1fdcb6fa90e0bfb97e125ae1b3dd) --- source3/libsmb/cliconnect.c | 2 +- source3/libsmb/clierror.c | 2 +- source3/libsmb/nmblib.c | 6 +++--- source3/libsmb/nterr.c | 2 +- source3/libsmb/smberr.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 680f30900ea..aae21cb6d9e 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -24,7 +24,7 @@ #include "includes.h" -static struct { +static const struct { int prot; const char *name; } diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c index bcecc92d778..fe793d4b0e3 100644 --- a/source3/libsmb/clierror.c +++ b/source3/libsmb/clierror.c @@ -27,7 +27,7 @@ RAP error codes - a small start but will be extended. *******************************************************/ -static struct +static const struct { int err; char *message; diff --git a/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c index d7bd7b49a0b..dc399248186 100644 --- a/source3/libsmb/nmblib.c +++ b/source3/libsmb/nmblib.c @@ -25,7 +25,7 @@ int num_good_sends = 0; int num_good_receives = 0; -static struct opcode_names { +static const struct opcode_names { char *nmb_opcode_name; int opcode; } nmb_header_opcode_names[] = { @@ -42,9 +42,9 @@ static struct opcode_names { /**************************************************************************** * Lookup a nmb opcode name. ****************************************************************************/ -static char *lookup_opcode_name( int opcode ) +static const char *lookup_opcode_name( int opcode ) { - struct opcode_names *op_namep; + const struct opcode_names *op_namep; int i; for(i = 0; nmb_header_opcode_names[i].nmb_opcode_name != 0; i++) { diff --git a/source3/libsmb/nterr.c b/source3/libsmb/nterr.c index 1f61e648c20..ab0a4256335 100644 --- a/source3/libsmb/nterr.c +++ b/source3/libsmb/nterr.c @@ -23,7 +23,7 @@ #include "includes.h" -typedef struct +typedef const struct { char *nt_errstr; NTSTATUS nt_errcode; diff --git a/source3/libsmb/smberr.c b/source3/libsmb/smberr.c index 0b59b5b1a51..66256d2385d 100644 --- a/source3/libsmb/smberr.c +++ b/source3/libsmb/smberr.c @@ -25,7 +25,7 @@ /* error code stuff - put together by Merik Karman merik@blackadder.dsh.oz.au */ -typedef struct +typedef const struct { char *name; int code; @@ -125,7 +125,7 @@ err_code_struct hard_msgs[] = { {NULL,-1,NULL}}; -struct +const struct { int code; char *class; -- 2.34.1