sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-29 15:42:04 +03:00
Code Activity

Make a number of the lookup tables 'const'. I'm told this assists in sharing

Browse Source 
memory between users of shared libs.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
-
parent 20f6f9e3a2
commit 41dd5a4d29
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/lib/error.c
View File

@ -22,7 +22,7 @@
/* Mapping between Unix, DOS and NT error numbers */ /* Mapping between Unix, DOS and NT error numbers */
struct unix_error_map unix_dos_nt_errmap[] = { const struct unix_error_map unix_dos_nt_errmap[] = {
{ EPERM, ERRDOS, ERRnoaccess, NT_STATUS_ACCESS_DENIED }, { EPERM, ERRDOS, ERRnoaccess, NT_STATUS_ACCESS_DENIED },
{ EACCES, ERRDOS, ERRnoaccess, NT_STATUS_ACCESS_DENIED }, { EACCES, ERRDOS, ERRnoaccess, NT_STATUS_ACCESS_DENIED },
{ ENOENT, ERRDOS, ERRbadfile, NT_STATUS_NO_SUCH_FILE }, { ENOENT, ERRDOS, ERRbadfile, NT_STATUS_NO_SUCH_FILE },

4
source/lib/pam_errors.c
View File

@ -24,7 +24,7 @@
#include <security/pam_appl.h> #include <security/pam_appl.h>
/* PAM -> NT_STATUS map */ /* PAM -> NT_STATUS map */
static struct { const static struct {
int pam_code; int pam_code;
NTSTATUS ntstatus; NTSTATUS ntstatus;
} pam_to_nt_status_map[] = { } pam_to_nt_status_map[] = {
@ -55,7 +55,7 @@ static struct {
}; };
/* NT_STATUS -> PAM map */ /* NT_STATUS -> PAM map */
static struct { const static struct {
NTSTATUS ntstatus; NTSTATUS ntstatus;
int pam_code; int pam_code;
} nt_status_to_pam_map[] = { } nt_status_to_pam_map[] = {

6
source/libsmb/errormap.c
View File

@ -43,7 +43,7 @@
*/ */
/* NT status -> dos error map */ /* NT status -> dos error map */
static struct { const static struct {
uint8 dos_class; uint8 dos_class;
uint32 dos_code; uint32 dos_code;
NTSTATUS ntstatus; NTSTATUS ntstatus;
@ -609,7 +609,7 @@ static struct {
/* dos -> nt status error map */ /* dos -> nt status error map */
static struct { const static struct {
uint8 dos_class; uint8 dos_class;
uint32 dos_code; uint32 dos_code;
NTSTATUS ntstatus; NTSTATUS ntstatus;
@ -864,7 +864,7 @@ static struct {
}; };
/* errmap NTSTATUS->Win32 */ /* errmap NTSTATUS->Win32 */
static struct { const static struct {
NTSTATUS ntstatus; NTSTATUS ntstatus;
WERROR werror; WERROR werror;
} ntstatus_to_werror_map[] = { } ntstatus_to_werror_map[] = {

18
source/libsmb/smbdes.c
View File

@ -48,7 +48,7 @@
#define uchar unsigned char #define uchar unsigned char
static uchar perm1[56] = {57, 49, 41, 33, 25, 17, 9, static const uchar perm1[56] = {57, 49, 41, 33, 25, 17, 9,
1, 58, 50, 42, 34, 26, 18, 1, 58, 50, 42, 34, 26, 18,
10, 2, 59, 51, 43, 35, 27, 10, 2, 59, 51, 43, 35, 27,
19, 11, 3, 60, 52, 44, 36, 19, 11, 3, 60, 52, 44, 36,
@ -57,7 +57,7 @@ static uchar perm1[56] = {57, 49, 41, 33, 25, 17, 9,
14, 6, 61, 53, 45, 37, 29, 14, 6, 61, 53, 45, 37, 29,
21, 13, 5, 28, 20, 12, 4}; 21, 13, 5, 28, 20, 12, 4};
static uchar perm2[48] = {14, 17, 11, 24, 1, 5, static const uchar perm2[48] = {14, 17, 11, 24, 1, 5,
3, 28, 15, 6, 21, 10, 3, 28, 15, 6, 21, 10,
23, 19, 12, 4, 26, 8, 23, 19, 12, 4, 26, 8,
16, 7, 27, 20, 13, 2, 16, 7, 27, 20, 13, 2,
@ -66,7 +66,7 @@ static uchar perm2[48] = {14, 17, 11, 24, 1, 5,
44, 49, 39, 56, 34, 53, 44, 49, 39, 56, 34, 53,
46, 42, 50, 36, 29, 32}; 46, 42, 50, 36, 29, 32};
static uchar perm3[64] = {58, 50, 42, 34, 26, 18, 10, 2, static const uchar perm3[64] = {58, 50, 42, 34, 26, 18, 10, 2,
60, 52, 44, 36, 28, 20, 12, 4, 60, 52, 44, 36, 28, 20, 12, 4,
62, 54, 46, 38, 30, 22, 14, 6, 62, 54, 46, 38, 30, 22, 14, 6,
64, 56, 48, 40, 32, 24, 16, 8, 64, 56, 48, 40, 32, 24, 16, 8,
@ -75,7 +75,7 @@ static uchar perm3[64] = {58, 50, 42, 34, 26, 18, 10, 2,
61, 53, 45, 37, 29, 21, 13, 5, 61, 53, 45, 37, 29, 21, 13, 5,
63, 55, 47, 39, 31, 23, 15, 7}; 63, 55, 47, 39, 31, 23, 15, 7};
static uchar perm4[48] = { 32, 1, 2, 3, 4, 5, static const uchar perm4[48] = { 32, 1, 2, 3, 4, 5,
4, 5, 6, 7, 8, 9, 4, 5, 6, 7, 8, 9,
8, 9, 10, 11, 12, 13, 8, 9, 10, 11, 12, 13,
12, 13, 14, 15, 16, 17, 12, 13, 14, 15, 16, 17,
@ -84,7 +84,7 @@ static uchar perm4[48] = { 32, 1, 2, 3, 4, 5,
24, 25, 26, 27, 28, 29, 24, 25, 26, 27, 28, 29,
28, 29, 30, 31, 32, 1}; 28, 29, 30, 31, 32, 1};
static uchar perm5[32] = { 16, 7, 20, 21, static const uchar perm5[32] = { 16, 7, 20, 21,
29, 12, 28, 17, 29, 12, 28, 17,
1, 15, 23, 26, 1, 15, 23, 26,
5, 18, 31, 10, 5, 18, 31, 10,
@ -94,7 +94,7 @@ static uchar perm5[32] = { 16, 7, 20, 21,
22, 11, 4, 25}; 22, 11, 4, 25};
static uchar perm6[64] ={ 40, 8, 48, 16, 56, 24, 64, 32, static const uchar perm6[64] ={ 40, 8, 48, 16, 56, 24, 64, 32,
39, 7, 47, 15, 55, 23, 63, 31, 39, 7, 47, 15, 55, 23, 63, 31,
38, 6, 46, 14, 54, 22, 62, 30, 38, 6, 46, 14, 54, 22, 62, 30,
37, 5, 45, 13, 53, 21, 61, 29, 37, 5, 45, 13, 53, 21, 61, 29,
@ -104,9 +104,9 @@ static uchar perm6[64] ={ 40, 8, 48, 16, 56, 24, 64, 32,
33, 1, 41, 9, 49, 17, 57, 25}; 33, 1, 41, 9, 49, 17, 57, 25};
static uchar sc[16] = {1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1}; static const uchar sc[16] = {1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1};
static uchar sbox[8][4][16] = { static const uchar sbox[8][4][16] = {
{{14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7}, {{14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7},
{0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8}, {0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8},
{4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0}, {4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0},
@ -147,7 +147,7 @@ static uchar sbox[8][4][16] = {
{7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8}, {7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8},
{2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11}}}; {2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11}}};
static void permute(char *out, char *in, uchar *p, int n) static void permute(char *out, const char *in, const uchar *p, int n)
{ {
int i; int i;
for (i=0;i<n;i++) for (i=0;i<n;i++)