Some calls to PerlMemShared_alloc() aren't checking the return value.

[perl5.git] / ext / SDBM_File / SDBM_File.xs

diff --git a/ext/SDBM_File/SDBM_File.xs b/ext/SDBM_File/SDBM_File.xs
index 789e5c8..3bf3c2b 100644 (file)
--- a/ext/SDBM_File/SDBM_File.xs
+++ b/ext/SDBM_File/SDBM_File.xs
@@ -1,16 +1,29 @@
+#define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
 #include "sdbm/sdbm.h"
 
-typedef DBM* SDBM_File;
+typedef struct {
+       DBM *   dbp ;
+       SV *    filter_fetch_key ;
+       SV *    filter_store_key ;
+       SV *    filter_fetch_value ;
+       SV *    filter_store_value ;
+       int     filtering ;
+       } SDBM_File_type;
+
+typedef SDBM_File_type * SDBM_File ;
+typedef datum datum_key ;
+typedef datum datum_value ;
+
 #define sdbm_TIEHASH(dbtype,filename,flags,mode) sdbm_open(filename,flags,mode)
-#define sdbm_FETCH(db,key)                     sdbm_fetch(db,key)
-#define sdbm_STORE(db,key,value,flags)         sdbm_store(db,key,value,flags)
-#define sdbm_DELETE(db,key)                    sdbm_delete(db,key)
-#define sdbm_EXISTS(db,key)                    sdbm_exists(db,key)
-#define sdbm_FIRSTKEY(db)                      sdbm_firstkey(db)
-#define sdbm_NEXTKEY(db,key)                   sdbm_nextkey(db)
+#define sdbm_FETCH(db,key)                     sdbm_fetch(db->dbp,key)
+#define sdbm_STORE(db,key,value,flags)         sdbm_store(db->dbp,key,value,flags)
+#define sdbm_DELETE(db,key)                    sdbm_delete(db->dbp,key)
+#define sdbm_EXISTS(db,key)                    sdbm_exists(db->dbp,key)
+#define sdbm_FIRSTKEY(db)                      sdbm_firstkey(db->dbp)
+#define sdbm_NEXTKEY(db,key)                   sdbm_nextkey(db->dbp)
 
 
 MODULE = SDBM_File     PACKAGE = SDBM_File     PREFIX = sdbm_
@@ -21,23 +34,46 @@ sdbm_TIEHASH(dbtype, filename, flags, mode)
        char *          filename
        int             flags
        int             mode
+       CODE:
+       {
+           DBM *       dbp ;
+
+           RETVAL = NULL ;
+           if ((dbp = sdbm_open(filename,flags,mode))) {
+               RETVAL = (SDBM_File)safemalloc(sizeof(SDBM_File_type)) ;
+               Zero(RETVAL, 1, SDBM_File_type) ;
+               RETVAL->dbp = dbp ;
+           }
+           
+       }
+       OUTPUT:
+         RETVAL
 
 void
 sdbm_DESTROY(db)
        SDBM_File       db
        CODE:
-       sdbm_close(db);
+         sdbm_close(db->dbp);
+         if (db->filter_fetch_key)
+           SvREFCNT_dec(db->filter_fetch_key) ;
+         if (db->filter_store_key)
+           SvREFCNT_dec(db->filter_store_key) ;
+         if (db->filter_fetch_value)
+           SvREFCNT_dec(db->filter_fetch_value) ;
+         if (db->filter_store_value)
+           SvREFCNT_dec(db->filter_store_value) ;
+         safefree(db) ;
 
-datum
+datum_value
 sdbm_FETCH(db, key)
        SDBM_File       db
-       datum           key
+       datum_key       key
 
 int
 sdbm_STORE(db, key, value, flags = DBM_REPLACE)
        SDBM_File       db
-       datum           key
-       datum           value
+       datum_key       key
+       datum_value     value
        int             flags
     CLEANUP:
        if (RETVAL) {
@@ -45,33 +81,74 @@ sdbm_STORE(db, key, value, flags = DBM_REPLACE)
                croak("No write permission to sdbm file");
            croak("sdbm store returned %d, errno %d, key \"%s\"",
                        RETVAL,errno,key.dptr);
-           sdbm_clearerr(db);
+           sdbm_clearerr(db->dbp);
        }
 
 int
 sdbm_DELETE(db, key)
        SDBM_File       db
-       datum           key
+       datum_key       key
 
 int
 sdbm_EXISTS(db,key)
        SDBM_File       db
-       datum           key
+       datum_key       key
 
-datum
+datum_key
 sdbm_FIRSTKEY(db)
        SDBM_File       db
 
-datum
+datum_key
 sdbm_NEXTKEY(db, key)
        SDBM_File       db
-       datum           key
+       datum_key       key = key; /* never used -  silence picky compilers. */
 
 int
 sdbm_error(db)
        SDBM_File       db
+       CODE:
+       RETVAL = sdbm_error(db->dbp) ;
+       OUTPUT:
+         RETVAL
 
 int
 sdbm_clearerr(db)
        SDBM_File       db
+       CODE:
+       RETVAL = sdbm_clearerr(db->dbp) ;
+       OUTPUT:
+         RETVAL
+
+
+SV *
+filter_fetch_key(db, code)
+       SDBM_File       db
+       SV *            code
+       SV *            RETVAL = &PL_sv_undef ;
+       CODE:
+           DBM_setFilter(db->filter_fetch_key, code) ;
+
+SV *
+filter_store_key(db, code)
+       SDBM_File       db
+       SV *            code
+       SV *            RETVAL =  &PL_sv_undef ;
+       CODE:
+           DBM_setFilter(db->filter_store_key, code) ;
+
+SV *
+filter_fetch_value(db, code)
+       SDBM_File       db
+       SV *            code
+       SV *            RETVAL =  &PL_sv_undef ;
+       CODE:
+           DBM_setFilter(db->filter_fetch_value, code) ;
+
+SV *
+filter_store_value(db, code)
+       SDBM_File       db
+       SV *            code
+       SV *            RETVAL =  &PL_sv_undef ;
+       CODE:
+           DBM_setFilter(db->filter_store_value, code) ;