From 3be8e1bbdde909f7432e1223bf3b4ee3c6470402 Mon Sep 17 00:00:00 2001 From: Sebastian Gniazdowski Date: Mon, 6 Feb 2017 15:46:11 -0800 Subject: 40507: Remove extraneous null creating GDBM records --- ChangeLog | 5 +++++ Src/Modules/db_gdbm.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ad26b720..0f24ac959 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-02-07 Peter Stephenson + + * Sebastian: 40507: Src/Modules/db_gdbm.c: remove extraneous + null byte creating records. + 2017-02-07 Daniel Shahaf * 40494: Completion/Unix/Command/_git: Use slashes matchspec diff --git a/Src/Modules/db_gdbm.c b/Src/Modules/db_gdbm.c index 8dd60fc0d..310e32948 100644 --- a/Src/Modules/db_gdbm.c +++ b/Src/Modules/db_gdbm.c @@ -170,7 +170,7 @@ gdbmgetfn(Param pm) GDBM_FILE dbf; key.dptr = pm->node.nam; - key.dsize = strlen(key.dptr) + 1; + key.dsize = strlen(key.dptr); dbf = (GDBM_FILE)(pm->u.hash->tmpdata); ret = gdbm_exists(dbf, key); @@ -191,9 +191,9 @@ gdbmsetfn(Param pm, char *val) GDBM_FILE dbf; key.dptr = pm->node.nam; - key.dsize = strlen(key.dptr) + 1; + key.dsize = strlen(key.dptr); content.dptr = val; - content.dsize = strlen(content.dptr) + 1; + content.dsize = strlen(content.dptr); dbf = (GDBM_FILE)(pm->u.hash->tmpdata); (void)gdbm_store(dbf, key, content, GDBM_REPLACE); @@ -207,7 +207,7 @@ gdbmunsetfn(Param pm, UNUSED(int um)) GDBM_FILE dbf; key.dptr = pm->node.nam; - key.dsize = strlen(key.dptr) + 1; + key.dsize = strlen(key.dptr); dbf = (GDBM_FILE)(pm->u.hash->tmpdata); (void)gdbm_delete(dbf, key); @@ -302,12 +302,12 @@ gdbmhashsetfn(Param pm, HashTable ht) v.pm = (Param) hn; key.dptr = v.pm->node.nam; - key.dsize = strlen(key.dptr) + 1; + key.dsize = strlen(key.dptr); queue_signals(); content.dptr = getstrvalue(&v); - content.dsize = strlen(content.dptr) + 1; + content.dsize = strlen(content.dptr); (void)gdbm_store(dbf, key, content, GDBM_REPLACE); -- cgit v1.2.3-70-g09d2