normalized flag arg and made flag, mode default args; minor cosmetics

diff --git a/Modules/dbmmodule.c b/Modules/dbmmodule.c
index 2ec43ffb8034014948e406f9ed5f8ade63f7e256..d0736f7ddb049757f4c6875d91230ffd205c1c72 100644 (file)
--- a/Modules/dbmmodule.c
+++ b/Modules/dbmmodule.c
@@ -60,7 +60,7 @@ newdbmobject(file, flags, mode)
        if ( (dp->di_dbm = dbm_open(file, flags, mode)) == 0 ) {
            err_errno(DbmError);
            DECREF(dp);
-           return 0;
+           return NULL;
        }
        return (object *)dp;
 }
@@ -107,12 +107,12 @@ dbm_subscript(dp, key)
        drec = dbm_fetch(dp->di_dbm, krec);
        if ( drec.dptr == 0 ) {
            err_setstr(KeyError, GETSTRINGVALUE((stringobject *)key));
-           return 0;
+           return NULL;
        }
        if ( dbm_error(dp->di_dbm) ) {
            dbm_clearerr(dp->di_dbm);
            err_setstr(DbmError, "");
-           return 0;
+           return NULL;
        }
        return newsizedstringobject(drec.dptr, drec.dsize);
 }
@@ -161,6 +161,21 @@ static mapping_methods dbm_as_mapping = {
        (objobjargproc)dbm_ass_sub,     /*mp_ass_subscript*/
 };
 
+static object *
+dbm__close(dp, args)
+       register dbmobject *dp;
+       object *args;
+{
+       if ( !getnoarg(args) )
+               return NULL;
+        if ( dp->di_dbm )
+           dbm_close(dp->di_dbm);
+       dp->di_dbm = NULL;
+       DEL(dp);
+       INCREF(None);
+       return None;
+}
+
 static object *
 dbm_keys(dp, args)
        register dbmobject *dp;
@@ -170,10 +185,6 @@ dbm_keys(dp, args)
        datum key;
        int err;
 
-       if (dp == NULL || !is_dbmobject(dp)) {
-               err_badcall();
-               return NULL;
-       }
        if (!getnoarg(args))
                return NULL;
        v = newlistobject(0);
@@ -196,7 +207,6 @@ dbm_keys(dp, args)
        return v;
 }
 
-
 static object *
 dbm_has_key(dp, args)
        register dbmobject *dp;
@@ -211,6 +221,7 @@ dbm_has_key(dp, args)
 }
 
 static struct methodlist dbm_methods[] = {
+       {"close",       (method)dbm__close},
        {"keys",        (method)dbm_keys},
        {"has_key",     (method)dbm_has_key},
        {NULL,          NULL}           /* sentinel */
@@ -227,7 +238,7 @@ dbm_getattr(dp, name)
 static typeobject Dbmtype = {
        OB_HEAD_INIT(&Typetype)
        0,
-       "Dbm_dictionary",
+       "dbm",
        sizeof(dbmobject),
        0,
        (destructor)dbm_dealloc, /*tp_dealloc*/
@@ -248,27 +259,33 @@ dbmopen(self, args)
     object *self;
     object *args;
 {
-    char *name, *flags;
-    int iflags, mode;
+       char *name;
+       char *flags = "r";
+       int iflags;
+       int mode = 0666;
 
-        if ( !getargs(args, "(ssi)", &name, &flags, &mode) )
-         return 0;
+        if ( !newgetargs(args, "s|si", &name, &flags, &mode) )
+         return NULL;
        if ( strcmp(flags, "r") == 0 )
          iflags = O_RDONLY;
        else if ( strcmp(flags, "w") == 0 )
-         iflags = O_WRONLY|O_CREAT;
-       else if ( strcmp(flags, "rw") == 0 )
+         iflags = O_RDWR;
+       else if ( strcmp(flags, "rw") == 0 ) /* B/W compat */
+         iflags = O_RDWR|O_CREAT; 
+       else if ( strcmp(flags, "c") == 0 )
          iflags = O_RDWR|O_CREAT;
+       else if ( strcmp(flags, "n") == 0 )
+         iflags = O_RDWR|O_CREAT|O_TRUNC;
        else {
            err_setstr(DbmError,
-                      "Flags should be one of 'r', 'w' or 'rw'");
-           return 0;
+                      "Flags should be one of 'r', 'w', 'c' or 'n'");
+           return NULL;
        }
         return newdbmobject(name, iflags, mode);
 }
 
 static struct methodlist dbmmodule_methods[] = {
-    { "open", (method)dbmopen },
+    { "open", (method)dbmopen, 1 },
     { 0, 0 },
 };
 
@@ -282,5 +299,3 @@ initdbm() {
     if ( DbmError == NULL || dictinsert(d, "error", DbmError) )
       fatal("can't define dbm.error");
 }
-
-       

diff --git a/Modules/gdbmmodule.c b/Modules/gdbmmodule.c
index 632846f2cc3636b57afbd512f317e4ecae4a6b6d..021531c2b7f784a0fedc5c1798212e9ecf700237 100644 (file)
--- a/Modules/gdbmmodule.c
+++ b/Modules/gdbmmodule.c
@@ -68,7 +68,7 @@ newdbmobject(file, flags, mode)
            else
                err_setstr(DbmError, (char *) gdbm_strerror(gdbm_errno));
            DECREF(dp);
-           return 0;
+           return NULL;
        }
        return (object *)dp;
 }
@@ -119,7 +119,7 @@ dbm_subscript(dp, key)
        drec = gdbm_fetch(dp->di_dbm, krec);
        if ( drec.dptr == 0 ) {
            err_setstr(KeyError, GETSTRINGVALUE((stringobject *)key));
-           return 0;
+           return NULL;
        }
        v = newsizedstringobject(drec.dptr, drec.dsize);
        free(drec.dptr);
@@ -167,6 +167,21 @@ static mapping_methods dbm_as_mapping = {
        (objobjargproc)dbm_ass_sub,     /*mp_ass_subscript*/
 };
 
+static object *
+dbm_close(dp, args)
+       register dbmobject *dp;
+       object *args;
+{
+       if ( !getnoarg(args) )
+               return NULL;
+        if ( dp->di_dbm )
+               gdbm_close(dp->di_dbm);
+       dp->di_dbm = NULL;
+       DEL(dp);
+       INCREF(None);
+       return None;
+}
+
 static object *
 dbm_keys(dp, args)
        register dbmobject *dp;
@@ -271,6 +286,7 @@ dbm_reorganize(dp, args)
 }
 
 static struct methodlist dbm_methods[] = {
+       {"close",       (method)dbm_close},
        {"keys",        (method)dbm_keys},
        {"has_key",     (method)dbm_has_key},
        {"firstkey",    (method)dbm_firstkey},
@@ -290,7 +306,7 @@ dbm_getattr(dp, name)
 static typeobject Dbmtype = {
        OB_HEAD_INIT(&Typetype)
        0,
-       "Gdbm_dictionary",
+       "gdbm",
        sizeof(dbmobject),
        0,
        (destructor)dbm_dealloc, /*tp_dealloc*/
@@ -311,12 +327,14 @@ dbmopen(self, args)
     object *self;
     object *args;
 {
-    char *name, *flags;
-    int iflags, mode;
+    char *name;
+    char *flags = "r";
+    int iflags;
+   int mode = 0666;
 
 /* XXXX add other flags */
-        if ( !getargs(args, "(ssi)", &name, &flags, &mode) )
-         return 0;
+        if ( !newgetargs(args, "s|si", &name, &flags, &mode) )
+         return NULL;
        if ( strcmp(flags, "r") == 0 )
          iflags = GDBM_READER;
        else if ( strcmp(flags, "w") == 0 )
@@ -328,13 +346,13 @@ dbmopen(self, args)
        else {
            err_setstr(DbmError,
                       "Flags should be one of 'r', 'w', 'c' or 'n'");
-           return 0;
+           return NULL;
        }
         return newdbmobject(name, iflags, mode);
 }
 
 static struct methodlist dbmmodule_methods[] = {
-    { "open", (method)dbmopen },
+    { "open", (method)dbmopen, 1 },
     { 0, 0 },
 };