ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/BDB/BDB.xs
(Generate patch)

Comparing BDB/BDB.xs (file contents):
Revision 1.60 by root, Mon Oct 20 02:58:42 2008 UTC vs.
Revision 1.61 by root, Mon Oct 20 03:29:37 2008 UTC

… …
1196 const_iv (NOSYNC) 1196 const_iv (NOSYNC)
1197 const_iv (CHKSUM) 1197 const_iv (CHKSUM)
1198 const_iv (ENCRYPT) 1198 const_iv (ENCRYPT)
1199 const_iv (DUP) 1199 const_iv (DUP)
1200 const_iv (DUPSORT) 1200 const_iv (DUPSORT)
1201 const_iv (RECNUM) 1201 //const_iv (RECNUM)
1202 const_iv (RENUMBER) 1202 const_iv (RENUMBER)
1203 const_iv (REVSPLITOFF) 1203 const_iv (REVSPLITOFF)
1204 const_iv (CONSUME) 1204 const_iv (CONSUME)
1205 const_iv (CONSUME_WAIT) 1205 const_iv (CONSUME_WAIT)
1206 const_iv (GET_BOTH) 1206 const_iv (GET_BOTH)
… …
1322 const_iv (PRIORITY_DEFAULT) 1322 const_iv (PRIORITY_DEFAULT)
1323 const_iv (PRIORITY_HIGH) 1323 const_iv (PRIORITY_HIGH)
1324 const_iv (PRIORITY_VERY_HIGH) 1324 const_iv (PRIORITY_VERY_HIGH)
1325#endif 1325#endif
1326#if DB_VERSION_MINOR >= 7 1326#if DB_VERSION_MINOR >= 7
1327 const_iv (IGNORE_LEASE)
1328 //const_iv (MULTIPLE_KEY)
1327 const_iv (LOG_DIRECT) 1329 const_iv (LOG_DIRECT)
1328 const_iv (LOG_DSYNC) 1330 const_iv (LOG_DSYNC)
1329 const_iv (LOG_AUTO_REMOVE) 1331 const_iv (LOG_AUTO_REMOVE)
1330 const_iv (LOG_IN_MEMORY) 1332 const_iv (LOG_IN_MEMORY)
1331 const_iv (LOG_ZERO) 1333 const_iv (LOG_ZERO)
… …
1907db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0) 1909db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1908 PREINIT: 1910 PREINIT:
1909 CALLBACK 1911 CALLBACK
1910 CODE: 1912 CODE:
1911{ 1913{
1912 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 1914 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1913 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET"); 1915 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET");
1914 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1)) 1916 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
1915 croak ("argument \"%s\" must be byte/octet-encoded in %s", 1917 croak ("argument \"%s\" must be byte/octet-encoded in %s",
1916 "key", 1918 "key",
1917 "BDB::db_c_get"); 1919 "BDB::db_c_get");
1918 1920
1919 { 1921 {
1920 dREQ (REQ_C_GET, 1); 1922 dREQ (REQ_C_GET, 1);
1921 req->dbc = dbc; 1923 req->dbc = dbc;
1922 req->uint1 = flags; 1924 req->uint1 = flags;
1923 if (flags & DB_OPFLAGS_MASK == DB_SET) 1925 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1924 sv_to_dbt (&req->dbt1, key); 1926 sv_to_dbt (&req->dbt1, key);
1925 else 1927 else
1926 { 1928 {
1927 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 1929 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1928 sv_to_dbt (&req->dbt1, key); 1930 sv_to_dbt (&req->dbt1, key);
1929 else 1931 else
1930 req->dbt1.flags = DB_DBT_MALLOC; 1932 req->dbt1.flags = DB_DBT_MALLOC;
1931 1933
1932 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 1934 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1933 } 1935 }
1934 1936
1935 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 1937 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1936 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 1938 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1937 sv_to_dbt (&req->dbt3, data); 1939 sv_to_dbt (&req->dbt3, data);
1938 else 1940 else
1939 req->dbt3.flags = DB_DBT_MALLOC; 1941 req->dbt3.flags = DB_DBT_MALLOC;
1940 1942
1941 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1943 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
… …
1947db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0) 1949db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1948 PREINIT: 1950 PREINIT:
1949 CALLBACK 1951 CALLBACK
1950 CODE: 1952 CODE:
1951{ 1953{
1952 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 1954 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1953 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET"); 1955 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET");
1954 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1)) 1956 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
1955 croak ("argument \"%s\" must be byte/octet-encoded in %s", 1957 croak ("argument \"%s\" must be byte/octet-encoded in %s",
1956 "key", 1958 "key",
1957 "BDB::db_c_pget"); 1959 "BDB::db_c_pget");
1958 1960
1959 { 1961 {
1960 dREQ (REQ_C_PGET, 1); 1962 dREQ (REQ_C_PGET, 1);
1961 req->dbc = dbc; 1963 req->dbc = dbc;
1962 req->uint1 = flags; 1964 req->uint1 = flags;
1963 if (flags & DB_OPFLAGS_MASK == DB_SET) 1965 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1964 sv_to_dbt (&req->dbt1, key); 1966 sv_to_dbt (&req->dbt1, key);
1965 else 1967 else
1966 { 1968 {
1967 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 1969 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1968 sv_to_dbt (&req->dbt1, key); 1970 sv_to_dbt (&req->dbt1, key);
1969 else 1971 else
1970 req->dbt1.flags = DB_DBT_MALLOC; 1972 req->dbt1.flags = DB_DBT_MALLOC;
1971 1973
1972 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 1974 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1973 } 1975 }
1974 1976
1975 req->dbt2.flags = DB_DBT_MALLOC; 1977 req->dbt2.flags = DB_DBT_MALLOC;
1976 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 1978 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1977 1979
1978 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 1980 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1979 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 1981 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1980 sv_to_dbt (&req->dbt3, data); 1982 sv_to_dbt (&req->dbt3, data);
1981 else 1983 else
1982 req->dbt3.flags = DB_DBT_MALLOC; 1984 req->dbt3.flags = DB_DBT_MALLOC;
1983 1985
1984 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 1986 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines