The branch, master has been updated via 04a9a1a lib: Slightly simplify strupper_m via 2dab2f0 registry: Slightly simplify tdb_data_is_cstr from fb39c6f Move dnspython to third_party.
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 04a9a1ac6def992fe0ed97ad96b706bec709ec18 Author: Volker Lendecke <v...@samba.org> Date: Sun Nov 9 12:48:09 2014 +0000 lib: Slightly simplify strupper_m toupper_ascii_fast_table is only referenced here, make it static. Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Fri Nov 14 00:31:16 CET 2014 on sn-devel-104 commit 2dab2f0f73160bafcaa3aa4cce7dcccc1ddcb3ba Author: Volker Lendecke <v...@samba.org> Date: Sun Nov 9 12:50:53 2014 +0000 registry: Slightly simplify tdb_data_is_cstr Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/include/smb_macros.h | 8 -------- source3/lib/util_str.c | 4 ++-- source3/registry/reg_backend_db.c | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index cd47950..42a9756 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -292,14 +292,6 @@ do { \ #define ADD_TO_LARGE_ARRAY(mem_ctx, type, elem, array, num, size) \ add_to_large_array((mem_ctx), sizeof(type), &(elem), (void *)(array), (num), (size)); -#ifndef toupper_ascii_fast -/* Warning - this must only be called with 0 <= c < 128. IT WILL - * GIVE GARBAGE if c > 128 or c < 0. JRA. - */ -extern const char toupper_ascii_fast_table[]; -#define toupper_ascii_fast(c) toupper_ascii_fast_table[(unsigned int)(c)]; -#endif - #define trans_oob(bufsize, offset, length) \ smb_buffer_oob(bufsize, offset, length) diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index 2b0830c..3de64c6 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -25,7 +25,7 @@ #include "includes.h" #include "lib/param/loadparm.h" -const char toupper_ascii_fast_table[128] = { +static const char toupper_ascii_fast_table[128] = { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, @@ -559,7 +559,7 @@ bool strupper_m(char *s) (ie. they match for the first 128 chars) */ while (*s && !(((unsigned char)s[0]) & 0x80)) { - *s = toupper_ascii_fast((unsigned char)*s); + *s = toupper_ascii_fast_table[(unsigned char)s[0]]; s++; } diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c index 67beb6a..44a3d9f 100644 --- a/source3/registry/reg_backend_db.c +++ b/source3/registry/reg_backend_db.c @@ -547,7 +547,7 @@ static bool tdb_data_is_cstr(TDB_DATA d) { if (tdb_data_is_empty(d) || (d.dptr[d.dsize-1] != '\0')) { return false; } - return strchr((char *)d.dptr, '\0') == (char *)&d.dptr[d.dsize-1]; + return strlen((char *)d.dptr) == (d.dsize-1); } static bool upgrade_v2_to_v3_check_subkeylist(struct db_context *db, -- Samba Shared Repository