[SCM] Samba Shared Repository - branch master updated
Martin Schwenke
martins at samba.org
Wed Oct 23 02:38:02 UTC 2019
The branch, master has been updated
via f37b913348e smbd: Save 520 bytes of writable memory from every smbd
via 0559701478d smbd: Remove an unused #define from mangle_hash2.c
via ccc486ca118 smbd: Mark #else/#endif with the if-#define
from aa376682180 ctdb-tests: Add -l option to set number of local daemons
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f37b913348e921afee3e578ff0f14b731157eb03
Author: Volker Lendecke <vl at samba.org>
Date: Mon Oct 21 14:38:47 2019 +0200
smbd: Save 520 bytes of writable memory from every smbd
Move what can be const from the "data" to the "text" segment
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
Autobuild-User(master): Martin Schwenke <martins at samba.org>
Autobuild-Date(master): Wed Oct 23 02:37:12 UTC 2019 on sn-devel-184
commit 0559701478d42e969c8c779d765163271ca9141e
Author: Volker Lendecke <vl at samba.org>
Date: Mon Oct 21 14:37:04 2019 +0200
smbd: Remove an unused #define from mangle_hash2.c
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit ccc486ca1184962df57e380954747f1593317bb5
Author: Volker Lendecke <vl at samba.org>
Date: Tue Oct 22 08:30:01 2019 +0200
smbd: Mark #else/#endif with the if-#define
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/mangle_hash2.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/mangle_hash2.c b/source3/smbd/mangle_hash2.c
index ac1f4b0f4fb..92319495f2a 100644
--- a/source3/smbd/mangle_hash2.c
+++ b/source3/smbd/mangle_hash2.c
@@ -89,11 +89,6 @@
#define FLAG_POSSIBLE3 64
#define FLAG_POSSIBLE4 128
-/* by default have a max of 4096 entries in the cache. */
-#ifndef MANGLE_CACHE_SIZE
-#define MANGLE_CACHE_SIZE 4096
-#endif
-
#define FNV1_PRIME 0x01000193
/*the following number is a fnv1 of the string: idra at samba.org 2002 */
#define FNV1_INIT 0xa6b93095
@@ -190,7 +185,7 @@ static void init_tables(void)
#endif
}
-#else
+#else /* DYNAMIC_MANGLE_TABLES */
/*
* These tables were initialized by a single run of the above
@@ -200,7 +195,7 @@ static void init_tables(void)
* initializers, but I'll leave it in: less surprise.
*/
-static uint8_t char_flags[256] = {
+static const uint8_t char_flags[256] = {
0x80, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
@@ -235,7 +230,7 @@ static uint8_t char_flags[256] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
-static uint8_t base_reverse[256] = {
+static const uint8_t base_reverse[256] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -270,7 +265,7 @@ static uint8_t base_reverse[256] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
-#endif
+#endif /* DYNAMIC_MANGLE_TABLES */
/*
hash a string of the specified length. The string does not need to be
@@ -438,7 +433,7 @@ static bool is_mangled(const char *name, const struct share_params *parm)
get larger when converted from UNIX to DOS formats)
*/
-static char force_shortname_chars[] = " +,[];=";
+static const char force_shortname_chars[] = " +,[];=";
static bool is_8_3(const char *name, bool check_case, bool allow_wildcards, const struct share_params *p)
{
--
Samba Shared Repository
More information about the samba-cvs
mailing list