From: <cli...@li...> - 2008-02-27 18:12:59
|
Send clisp-cvs mailing list submissions to cli...@li... To subscribe or unsubscribe via the World Wide Web, visit https://lists.sourceforge.net/lists/listinfo/clisp-cvs or, via email, send a message with subject or body 'help' to cli...@li... You can reach the person managing the list at cli...@li... When replying, please edit your Subject line so it is more specific than "Re: Contents of clisp-cvs digest..." CLISP CVS commits for today Today's Topics: 1. clisp/modules/syscalls calls.c,1.186,1.187 (Sam Steingold) 2. clisp/src ChangeLog,1.6029,1.6030 (Sam Steingold) 3. clisp/modules/syscalls calls.c,1.187,1.188 (Sam Steingold) 4. clisp/modules/gdbm gdbm.c,1.37,1.38 (Sam Steingold) 5. clisp/modules/pcre cpcre.c,1.39,1.40 (Sam Steingold) 6. clisp/modules/rawsock rawsock.c,1.91,1.92 (Sam Steingold) 7. clisp/modules/berkeley-db bdb.c,1.114,1.115 (Sam Steingold) ---------------------------------------------------------------------- Message: 1 Date: Wed, 27 Feb 2008 16:06:39 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/modules/syscalls calls.c,1.186,1.187 To: cli...@li... Message-ID: <E1J...@ma...> Update of /cvsroot/clisp/clisp/modules/syscalls In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23448/modules/syscalls Modified Files: calls.c Log Message: (copy_method_t): move before DEFMODULE for DEFCHECKER to work (check_copy_method): replace with a DEFCHECKER (copy_method_object): remove Index: calls.c =================================================================== RCS file: /cvsroot/clisp/clisp/modules/syscalls/calls.c,v retrieving revision 1.186 retrieving revision 1.187 diff -u -d -r1.186 -r1.187 --- calls.c 27 Feb 2008 15:20:21 -0000 1.186 +++ calls.c 27 Feb 2008 16:06:37 -0000 1.187 @@ -1,6 +1,6 @@ /* * system calls - * Copyright (C) 2003-2007 Sam Steingold + * Copyright (C) 2003-2008 Sam Steingold * Copyright (C) 2005 Bruno Haible * Copyright (C) 2005 Arseny Slobodyuk * GPL2 @@ -112,6 +112,14 @@ # include <fcntl.h> #endif +/* for COPY-FILE, must come before DEFMODULE for DEFCHECKER to work */ +typedef enum { + COPY_METHOD_COPY, + COPY_METHOD_SYMLINK, + COPY_METHOD_HARDLINK, + COPY_METHOD_RENAME +} copy_method_t; + DEFMODULE(syscalls,"POSIX") /* ============================== aux ============================== */ @@ -2812,40 +2820,8 @@ Car(*retval) = listof(3); } -typedef enum { - COPY_METHOD_COPY, - COPY_METHOD_SYMLINK, - COPY_METHOD_HARDLINK, - COPY_METHOD_RENAME -} copy_method_t; -static inline copy_method_t check_copy_method (object method) { - if (missingp(method) || eq(method,`:COPY`)) - return COPY_METHOD_COPY; - else if (eq(method,`:SYMLINK`)) - return COPY_METHOD_SYMLINK; - else if (eq(method,`:HARDLINK`)) - return COPY_METHOD_HARDLINK; - else if (eq(method,`:RENAME`)) - return COPY_METHOD_RENAME; - else { - pushSTACK(method); /* TYPE-ERROR slot DATUM */ - pushSTACK(`(MEMBER :HARDLINK :SYMLINK :RENAME :COPY)`); /* EXPECTED-TYPE */ - pushSTACK(method); - pushSTACK(`:METHOD`); - pushSTACK(`POSIX::COPY-FILE`); - error(type_error,GETTEXT("~S: ~S illegal ~S argument ~S")); - } -} -static inline object copy_method_object (copy_method_t method) { - switch (method) { - case COPY_METHOD_COPY: return `:COPY`; - case COPY_METHOD_SYMLINK: return `:SYMLINK`; - case COPY_METHOD_HARDLINK: return `:HARDLINK`; - case COPY_METHOD_RENAME: return `:RENAME`; - default: NOTREACHED; - } -} - +DEFCHECKER(check_copy_method,enum=copy_method_t,default=COPY_METHOD_COPY,\ + prefix=COPY_METHOD, COPY SYMLINK HARDLINK RENAME) /* copy just one file: source --> dest (both STRINGs, NIL or PATHNAME) can trigger GC */ static void copy_one_file (object source, object src_path, @@ -2879,7 +2855,7 @@ case IF_EXISTS_APPEND: /* we know that method != COPY_METHOD_COPY - handled above! */ pushSTACK(S(Kappend)); - pushSTACK(copy_method_object(method)); + pushSTACK(check_copy_method_reverse(method)); pushSTACK(`POSIX::COPY-FILE`); error(error_condition,GETTEXT("~S: ~S forbids ~S")); case IF_EXISTS_OVERWRITE: ------------------------------ Message: 2 Date: Wed, 27 Feb 2008 18:12:32 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src ChangeLog,1.6029,1.6030 To: cli...@li... Message-ID: <E1J...@ma...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8849/src Modified Files: ChangeLog Log Message: modules: use keyword symbols from the core when possible Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.6029 retrieving revision 1.6030 diff -u -d -r1.6029 -r1.6030 --- ChangeLog 27 Feb 2008 16:06:30 -0000 1.6029 +++ ChangeLog 27 Feb 2008 18:12:28 -0000 1.6030 @@ -1,5 +1,15 @@ 2008-02-27 Sam Steingold <sd...@gn...> + use keyword symbols from the core when possible + * utils/modprep.lisp (mk-objdef, objdef-object, objdef-local): add + (parse-signature, new-checker): use mk-objdef instead of init-to-objdef + (check-signature, lexical-analysis, print-tables-1): use + objdef-object & objdef-local instead of objdef-tag + * modules/berkeley-db/bdb.c, modules/gdbm/gdbm.c, modules/pcre/cpcre.c: + * modules/syscalls/calls.c: use #\: in DEFUN to denote core keywords + +2008-02-27 Sam Steingold <sd...@gn...> + * modules/syscalls/calls.c use S(K...) instead of `...` for common keywords (copy_method_t): move before DEFMODULE for DEFCHECKER to work ------------------------------ Message: 3 Date: Wed, 27 Feb 2008 18:12:33 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/modules/syscalls calls.c,1.187,1.188 To: cli...@li... Message-ID: <E1J...@ma...> Update of /cvsroot/clisp/clisp/modules/syscalls In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8849/modules/syscalls Modified Files: calls.c Log Message: modules: use keyword symbols from the core when possible Index: calls.c =================================================================== RCS file: /cvsroot/clisp/clisp/modules/syscalls/calls.c,v retrieving revision 1.187 retrieving revision 1.188 diff -u -d -r1.187 -r1.188 --- calls.c 27 Feb 2008 16:06:37 -0000 1.187 +++ calls.c 27 Feb 2008 18:12:30 -0000 1.188 @@ -181,7 +181,7 @@ #else # define I_to_offset(x) I_to_uint32(x) #endif -DEFUN(POSIX::STREAM-LOCK, stream lockp &key BLOCK SHARED START LENGTH) +DEFUN(POSIX::STREAM-LOCK, stream lockp &key :BLOCK SHARED :START :LENGTH) { /* the interface to fcntl(2) */ Handle fd = (Handle)-1; bool lock_p = !nullp(STACK_4), failed_p; @@ -318,7 +318,7 @@ DEFFLAGSET(syslog_opt_flags,LOG_PID LOG_CONS LOG_NDELAY LOG_ODELAY LOG_NOWAIT) #if defined(HAVE_OPENLOG) static char* log_ident=NULL; -DEFUN(POSIX:OPENLOG,ident &key :PID :CONS :NDELAY :ODELAY :NOWAIT :FACILITY) { +DEFUN(POSIX:OPENLOG,ident &key PID CONS NDELAY ODELAY NOWAIT FACILITY) { int facility = check_syslog_facility(popSTACK()); int logopt = syslog_opt_flags(); with_string_0(check_string(popSTACK()),GLO(misc_encoding),ident, { @@ -459,8 +459,8 @@ return asciz_to_string(path,GLO(pathname_encoding)); } #endif -DEFUN(POSIX:MKSTEMP, template &key DIRECTION BUFFERED EXTERNAL-FORMAT \ - ELEMENT-TYPE) { +DEFUN(POSIX:MKSTEMP, template &key :DIRECTION :BUFFERED :EXTERNAL-FORMAT \ + :ELEMENT-TYPE) { #if defined(HAVE_MKSTEMP) /* http://www.opengroup.org/onlinepubs/009695399/functions/mkstemp.html */ object fname = physical_namestring(STACK_4); @@ -1821,7 +1821,7 @@ if (mtime) *mtime = wfd.ftLastWriteTime; } #endif /* WIN32_NATIVE | UNIX_CYGWIN32*/ -DEFUN(POSIX::SET-FILE-STAT, file &key :ATIME :MTIME :MODE :UID :GID) +DEFUN(POSIX::SET-FILE-STAT, file &key ATIME MTIME MODE UID GID) { /* interface to chmod(2), chown(2), utime(2) http://www.opengroup.org/onlinepubs/009695399/functions/utime.html http://www.opengroup.org/onlinepubs/009695399/functions/chown.html @@ -2972,7 +2972,7 @@ | :error ;; (default) signal an error */ DEFUN(POSIX::COPY-FILE, source target &key METHOD PRESERVE \ - IF-EXISTS IF-DOES-NOT-EXIST) + :IF-EXISTS :IF-DOES-NOT-EXIST) { if_does_not_exist_t if_not_exists = check_if_does_not_exist(STACK_0); if_exists_t if_exists = check_if_exists(STACK_1); ------------------------------ Message: 4 Date: Wed, 27 Feb 2008 18:12:33 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/modules/gdbm gdbm.c,1.37,1.38 To: cli...@li... Message-ID: <E1J...@ma...> Update of /cvsroot/clisp/clisp/modules/gdbm In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8849/modules/gdbm Modified Files: gdbm.c Log Message: modules: use keyword symbols from the core when possible Index: gdbm.c =================================================================== RCS file: /cvsroot/clisp/clisp/modules/gdbm/gdbm.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- gdbm.c 23 Oct 2007 15:21:43 -0000 1.37 +++ gdbm.c 27 Feb 2008 18:12:31 -0000 1.38 @@ -2,7 +2,7 @@ * GDBM - The GNU database manager * <http://www.gnu.org/software/gdbm/> * Copyright (C) 2007 Masayuki Onjo <on...@li...> - * Copyright (C) 2007 Sam Steingold <sd...@gn...> + * Copyright (C) 2007-2008 Sam Steingold <sd...@gn...> * GPL2 */ @@ -76,10 +76,10 @@ pushSTACK(`:MESSAGE`); if (fatal_message) { pushSTACK(asciz_to_string(fatal_message, GLO(misc_encoding))); - pushSTACK(`:CODE`); pushSTACK(`:FATAL`); + pushSTACK(S(Kcode)); pushSTACK(`:FATAL`); } else { pushSTACK(safe_to_string(gdbm_strerror(gdbm_errno))); - pushSTACK(`:CODE`); pushSTACK(check_gdbm_errno_reverse(gdbm_errno)); + pushSTACK(S(Kcode)); pushSTACK(check_gdbm_errno_reverse(gdbm_errno)); } pushSTACK(`"~S: ~A"`); pushSTACK(TheSubr(subr_self)->name); @@ -112,7 +112,7 @@ pushSTACK(`GDBM::GDBM-ERROR`); pushSTACK(`:MESSAGE`); pushSTACK(`"open GDBM file required"`); - pushSTACK(`:CODE`); pushSTACK(`:CLOSED-FILE`); + pushSTACK(S(Kcode)); pushSTACK(`:CLOSED-FILE`); pushSTACK(`"~S: ~A"`); pushSTACK(TheSubr(subr_self)->name); pushSTACK(STACK_4); /* message */ @@ -138,8 +138,8 @@ READER WRITER WRCREAT NEWDB) DEFCHECKER(gdbm_open_option, default=0, prefix=GDBM, SYNC NOLOCK FAST) #if defined(HAVE_GDBM_OPEN) -DEFUN(GDBM::GDBM-OPEN, name &key :BLOCKSIZE :READ-WRITE :OPTION :MODE \ - :DEFAULT-KEY-TYPE :DEFAULT-VALUE-TYPE) +DEFUN(GDBM::GDBM-OPEN, name &key BLOCKSIZE READ-WRITE OPTION MODE \ + DEFAULT-KEY-TYPE DEFAULT-VALUE-TYPE) { gdbm_data_t default_value_type = check_data_type(popSTACK()); gdbm_data_t default_key_type = check_data_type(popSTACK()); @@ -221,7 +221,7 @@ pushSTACK(`"invalid lisp object type: "`); pushSTACK(lisp_obj); funcall(L(prin1_to_string),1); pushSTACK(value1); value1 = string_concat(2); pushSTACK(value1); - pushSTACK(`:CODE`); pushSTACK(`:LISP-TYPE`); + pushSTACK(S(Kcode)); pushSTACK(`:LISP-TYPE`); pushSTACK(`"~S: ~A"`); pushSTACK(TheSubr(subr_self)->name); pushSTACK(STACK_4); /* message */ @@ -305,7 +305,7 @@ pushSTACK(`GDBM::GDBM-ERROR`); pushSTACK(`:MESSAGE`); pushSTACK(`"32BIT-VECTOR conversion requires a datum length divisible by 4"`); - pushSTACK(`:CODE`); pushSTACK(`:DATUM-TYPE`); + pushSTACK(S(Kcode)); pushSTACK(`:DATUM-TYPE`); pushSTACK(`"~S: ~A"`); pushSTACK(TheSubr(subr_self)->name); pushSTACK(STACK_4); /* message */ @@ -336,7 +336,7 @@ pushSTACK(`GDBM::GDBM-ERROR`); pushSTACK(`:MESSAGE`); pushSTACK(`"desired lisp type not specified"`); - pushSTACK(`:CODE`); pushSTACK(`:DATUM-TYPE`); + pushSTACK(S(Kcode)); pushSTACK(`:DATUM-TYPE`); pushSTACK(`"~S: ~A"`); pushSTACK(TheSubr(subr_self)->name); pushSTACK(STACK_4); /* message */ @@ -347,7 +347,7 @@ } #if defined(HAVE_GDBM_FETCH) -DEFUN(GDBM:GDBM-FETCH, dbf key &key TYPE) +DEFUN(GDBM:GDBM-FETCH, dbf key &key :TYPE) { gdbm_data_t data_type = check_data_type(popSTACK()); GDBM_FILE dbf = check_gdbm(&STACK_1,NULL,&data_type,true); @@ -370,7 +370,7 @@ #endif /* HAVE_GDBM_DELETE */ #if defined(HAVE_GDBM_FIRSTKEY) -DEFUN(GDBM:GDBM-FIRSTKEY, dbf &key TYPE) +DEFUN(GDBM:GDBM-FIRSTKEY, dbf &key :TYPE) { gdbm_data_t data_type = check_data_type(popSTACK()); GDBM_FILE dbf = check_gdbm(&STACK_0,&data_type,NULL,true); @@ -381,7 +381,7 @@ #endif /* HAVE_GDBM_FIRSTKEY */ #if defined(HAVE_GDBM_NEXTKEY) -DEFUN(GDBM:GDBM-NEXTKEY, dbf key &key TYPE) +DEFUN(GDBM:GDBM-NEXTKEY, dbf key &key :TYPE) { gdbm_data_t data_type = check_data_type(STACK_0); GDBM_FILE dbf = check_gdbm(&STACK_2,&data_type,NULL,true); ------------------------------ Message: 5 Date: Wed, 27 Feb 2008 18:12:33 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/modules/pcre cpcre.c,1.39,1.40 To: cli...@li... Message-ID: <E1J...@ma...> Update of /cvsroot/clisp/clisp/modules/pcre In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8849/modules/pcre Modified Files: cpcre.c Log Message: modules: use keyword symbols from the core when possible Index: cpcre.c =================================================================== RCS file: /cvsroot/clisp/clisp/modules/pcre/cpcre.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- cpcre.c 25 Nov 2007 20:08:50 -0000 1.39 +++ cpcre.c 27 Feb 2008 18:12:31 -0000 1.40 @@ -1,7 +1,7 @@ /* * PCRE - Perl Compatible Regular Expressions * <http://www.pcre.org/> - * Copyright (C) 2003-2007 Sam Steingold + * Copyright (C) 2003-2008 Sam Steingold * GPL2 */ @@ -80,9 +80,9 @@ CASELESS MULTILINE DOTALL EXTENDED ANCHORED DOLLAR-ENDONLY EXTRA \ NOTBOL NOTEOL UNGREEDY NOTEMPTY UTF8 NO-AUTO-CAPTURE NO-UTF8-CHECK \ AUTO-CALLOUT PARTIAL) -DEFUN(PCRE:PCRE-COMPILE,string &key :STUDY :IGNORE-CASE :MULTILINE :DOTALL \ - :EXTENDED :ANCHORED :DOLLAR-ENDONLY :EXTRA :NOTBOL :NOTEOL :UNGREADY \ - :NOTEMPTY :NO-AUTO-CAPTURE :AUTO-CALLOUT :PARTIAL) +DEFUN(PCRE:PCRE-COMPILE,string &key STUDY IGNORE-CASE MULTILINE DOTALL \ + EXTENDED ANCHORED DOLLAR-ENDONLY EXTRA NOTBOL NOTEOL UNGREADY \ + NOTEMPTY NO-AUTO-CAPTURE AUTO-CALLOUT PARTIAL) { /* compile the pattern, return PATTERN struct */ int options = PCRE_UTF8 | pcre_compile_flags(); bool study = !missingp(STACK_0); @@ -337,8 +337,8 @@ DEFFLAGSET(pcre_exec_flags, PCRE_ANCHORED PCRE_NOTBOL PCRE_NOTEOL \ PCRE_NOTEMPTY PCRE_PARTIAL PCRE_DFA_SHORTEST PCRE_DFA_RESTART) -DEFUN(PCRE:PCRE-EXEC,pattern subject &key :WORK-SPACE :DFA :BOOLEAN :OFFSET \ - :ANCHORED :NOTBOL :NOTEOL :NOTEMPTY :PARTIAL :DFA-SHORTEST :DFA-RESTART) +DEFUN(PCRE:PCRE-EXEC,pattern subject &key WORK-SPACE DFA BOOLEAN OFFSET \ + ANCHORED NOTBOL NOTEOL NOTEMPTY PARTIAL DFA-SHORTEST DFA-RESTART) { /* match the SUBJECT string against a pre-compiled PATTERN; return a vector of MATCH structures or NIL if no matches */ int options = pcre_exec_flags(); ------------------------------ Message: 6 Date: Wed, 27 Feb 2008 18:12:33 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/modules/rawsock rawsock.c,1.91,1.92 To: cli...@li... Message-ID: <E1J...@ma...> Update of /cvsroot/clisp/clisp/modules/rawsock In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8849/modules/rawsock Modified Files: rawsock.c Log Message: modules: use keyword symbols from the core when possible Index: rawsock.c =================================================================== RCS file: /cvsroot/clisp/clisp/modules/rawsock/rawsock.c,v retrieving revision 1.91 retrieving revision 1.92 diff -u -d -r1.91 -r1.92 --- rawsock.c 26 Nov 2007 16:42:19 -0000 1.91 +++ rawsock.c 27 Feb 2008 18:12:31 -0000 1.92 @@ -2,7 +2,7 @@ * Module for Raw Sockets / CLISP * Fred Cohen, 2003-2004 * Don Cohen, 2003-2004 - * Sam Steingold 2004-2007 + * Sam Steingold 2004-2008 * Bruno Haible 2004-2005 * <http://www.opengroup.org/onlinepubs/007908799/xns/syssocket.h.html> */ @@ -598,7 +598,7 @@ #endif /* ifaddrs.h */ /* ================== sys/socket.h interface ================== */ DEFCHECKER(check_socket_domain,prefix=AF,default=AF_UNSPEC, \ - UNSPEC UNIX LOCAL INET IMPLINK PUP CHAOS AX25 DATAKIT CCITT \ + UNSPEC :UNIX LOCAL INET IMPLINK PUP CHAOS AX25 DATAKIT CCITT \ IPX NS ISO OSI ECMA APPLETALK NETROM BRIDGE ATMPVC X25 INET6 \ ROSE DECnet NETBEUI SECURITY KEY NETLINK DLI LAT HYLINK BAN \ ROUTE PACKET ASH ECONET ATM ATMSVC SNA IRDA NETBIOS VOICEVIEW \ @@ -799,7 +799,7 @@ #endif end_system_call(); pushSTACK(`RAWSOCK::EAI`); /* error type */ - pushSTACK(`:CODE`); pushSTACK(check_gai_ecode_reverse(ecode)); + pushSTACK(S(Kcode)); pushSTACK(check_gai_ecode_reverse(ecode)); pushSTACK(`:MESSAGE`); pushSTACK(asciz_to_string(msg,GLO(misc_encoding))); funcall(S(make_instance),5); pushSTACK(value1); funcall(S(error),1); @@ -864,7 +864,7 @@ end_system_call(); } DEFUN(RAWSOCK:GETADDRINFO, &key NODE SERVICE PROTOCOL SOCKTYPE FAMILY \ - PASSIVE CANONNAME NUMERICHOST NUMERICSERV V4MAPPED ALL ADDRCONFIG) { + PASSIVE CANONNAME NUMERICHOST NUMERICSERV V4MAPPED :ALL ADDRCONFIG) { struct addrinfo hints = {addrinfo_flags(), check_socket_domain(popSTACK()), check_socket_type(popSTACK()), @@ -914,7 +914,7 @@ /* remove 3 objects from the STACK and return the RECV flag based on MSG_PEEK MSG_OOB MSG_WAITALL */ DEFFLAGSET(recv_flags,MSG_PEEK MSG_OOB MSG_WAITALL) -DEFUN(RAWSOCK:RECV,socket buffer &key START END PEEK OOB WAITALL) { +DEFUN(RAWSOCK:RECV,socket buffer &key :START :END PEEK OOB WAITALL) { int flags = recv_flags(); rawsock_t sock = I_to_uint(check_uint(STACK_3)); int retval; @@ -924,7 +924,7 @@ VALUES1(fixnum(retval)); skipSTACK(2); } -DEFUN(RAWSOCK:RECVFROM, socket buffer address &key START END PEEK OOB WAITALL) { +DEFUN(RAWSOCK:RECVFROM,socket buffer address &key :START :END PEEK OOB WAITALL){ int flags = recv_flags(); rawsock_t sock = I_to_uint(check_uint(STACK_4)); int retval; @@ -989,7 +989,7 @@ TheStructure(*mho)->recdata[MSG_SOCKADDR] = popSTACK(); } /* POSIX recvmsg() */ -DEFUN(RAWSOCK:RECVMSG,socket message &key START END PEEK OOB WAITALL) { +DEFUN(RAWSOCK:RECVMSG,socket message &key :START :END PEEK OOB WAITALL) { int flags = recv_flags(); rawsock_t sock = I_to_uint(check_uint(STACK_3)); int retval; @@ -1006,7 +1006,7 @@ } #endif /* HAVE_RECVMSG & HAVE_MSGHDR_MSG_FLAGS & HAVE_MSGHDR_MSG_CONTROL */ -DEFUN(RAWSOCK:SOCK-READ,socket buffer &key START END) +DEFUN(RAWSOCK:SOCK-READ,socket buffer &key :START :END) { /* http://www.opengroup.org/onlinepubs/009695399/functions/read.html http://www.opengroup.org/onlinepubs/009695399/functions/readv.html */ rawsock_t sock = I_to_uint(check_uint(STACK_3)); @@ -1029,7 +1029,7 @@ /* remove 2 objects from the STACK and return the SEND flag based on MSG_OOB MSG_EOR */ DEFFLAGSET(send_flags, MSG_OOB MSG_EOR) -DEFUN(RAWSOCK:SEND,socket buffer &key START END OOB EOR) { +DEFUN(RAWSOCK:SEND,socket buffer &key :START :END OOB EOR) { int flags = send_flags(); rawsock_t sock = I_to_uint(check_uint(STACK_3)); int retval; @@ -1041,7 +1041,7 @@ #if defined(HAVE_RECVMSG) && defined(HAVE_SENDMSG) && defined(HAVE_STRUCT_MSGHDR_MSG_FLAGS) && defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) && defined(HAVE_SYS_UIO_H) /* POSIX sendmsg() */ -DEFUN(RAWSOCK:SENDMSG,socket message &key START END OOB EOR) { +DEFUN(RAWSOCK:SENDMSG,socket message &key :START :END OOB EOR) { int flags = send_flags(); rawsock_t sock = I_to_uint(check_uint(STACK_3)); int retval; @@ -1058,7 +1058,7 @@ } #endif /* HAVE_SENDMSG & HAVE_MSGHDR_MSG_FLAGS & HAVE_MSGHDR_MSG_CONTROL */ -DEFUN(RAWSOCK:SENDTO, socket buffer address &key START END OOB EOR) { +DEFUN(RAWSOCK:SENDTO, socket buffer address &key :START :END OOB EOR) { int flags = send_flags(); rawsock_t sock = I_to_uint(check_uint(STACK_4)); int retval; @@ -1077,7 +1077,7 @@ VALUES1(fixnum(retval)); skipSTACK(3); } -DEFUN(RAWSOCK:SOCK-WRITE,socket buffer &key START END) +DEFUN(RAWSOCK:SOCK-WRITE,socket buffer &key :START :END) { /* http://www.opengroup.org/onlinepubs/009695399/functions/write.html http://www.opengroup.org/onlinepubs/009695399/functions/writev.html */ rawsock_t sock = I_to_uint(check_uint(STACK_3)); @@ -1159,7 +1159,7 @@ IPPROTO-ICMPV6 IPPROTO-DSTOPTS IPPROTO-NONE) DEFCHECKER(sockopt_name,default=-1,prefix=SO, \ DEBUG ACCEPTCONN BROADCAST USELOOPBACK PEERCRED \ - REUSEADDR KEEPALIVE LINGER OOBINLINE SNDBUF RCVBUF ERROR TYPE \ + REUSEADDR KEEPALIVE LINGER OOBINLINE SNDBUF RCVBUF :ERROR :TYPE \ DONTROUTE RCVLOWAT RCVTIMEO SNDLOWAT SNDTIMEO) #endif #if defined(HAVE_GETSOCKOPT) || defined(WIN32_NATIVE) @@ -1397,7 +1397,7 @@ #endif /* ================== CHECKSUM from Fred Cohen ================== */ -DEFUN(RAWSOCK:IPCSUM, buffer &key START END) { /* IP CHECKSUM */ +DEFUN(RAWSOCK:IPCSUM, buffer &key :START :END) { /* IP checksum */ size_t length; unsigned char* buffer = (unsigned char*)parse_buffer_arg(&STACK_2,&length,PROT_READ_WRITE); @@ -1417,7 +1417,7 @@ skipSTACK(1); } -DEFUN(RAWSOCK:ICMPCSUM, buffer &key START END) { /* ICMP CHECKSUM */ +DEFUN(RAWSOCK:ICMPCSUM, buffer &key :START :END) { /* ICMP checksum */ size_t length; unsigned char* buffer = (unsigned char*)parse_buffer_arg(&STACK_2,&length,PROT_READ); @@ -1440,7 +1440,7 @@ skipSTACK(1); } -DEFUN(RAWSOCK:TCPCSUM, buffer &key START END) { /* TCP checksum */ +DEFUN(RAWSOCK:TCPCSUM, buffer &key :START :END) { /* TCP checksum */ size_t length; unsigned char* buffer = (unsigned char*)parse_buffer_arg(&STACK_2,&length,PROT_READ_WRITE); @@ -1469,7 +1469,7 @@ skipSTACK(1); } -DEFUN(RAWSOCK:UDPCSUM, buffer &key START END) { /* UDP checksum */ +DEFUN(RAWSOCK:UDPCSUM, buffer &key :START :END) { /* UDP checksum */ size_t length; unsigned char* buffer = (unsigned char*)parse_buffer_arg(&STACK_2,&length,PROT_READ_WRITE); ------------------------------ Message: 7 Date: Wed, 27 Feb 2008 18:12:33 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/modules/berkeley-db bdb.c,1.114,1.115 To: cli...@li... Message-ID: <E1J...@ma...> Update of /cvsroot/clisp/clisp/modules/berkeley-db In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8849/modules/berkeley-db Modified Files: bdb.c Log Message: modules: use keyword symbols from the core when possible Index: bdb.c =================================================================== RCS file: /cvsroot/clisp/clisp/modules/berkeley-db/bdb.c,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- bdb.c 25 Nov 2007 20:08:51 -0000 1.114 +++ bdb.c 27 Feb 2008 18:12:31 -0000 1.115 @@ -1,6 +1,6 @@ /* * CLISP: Berkeley-DB <http://www.sleepycat.com/docs/api_c/> - * Copyright (C) 2003-2007 by Sam Steingold + * Copyright (C) 2003-2008 by Sam Steingold */ /* have to undefing UNICODE _here_ because clisp.h will #include <windows.h> */ @@ -192,7 +192,7 @@ nonreturning_function(static, error_bdb, (int status, const char *caller)) { end_system_call(); pushSTACK(`BDB::BDB-ERROR`); /* error type */ - pushSTACK(`:CODE`); pushSTACK(bdb_errno_reverse(status)); + pushSTACK(S(Kcode)); pushSTACK(bdb_errno_reverse(status)); if (error_message) pushSTACK(`"~S (~S): ~S: ~S"`); else pushSTACK(`"~S (~S): ~S"`); @@ -360,8 +360,7 @@ { SYSCALL(dbe->set_encrypt,(dbe,password,flags)); }); } -DEFUN(BDB:DBE-CREATE,&key :PASSWORD :ENCRYPT \ - :HOST :CLIENT-TIMEOUT :SERVER-TIMEOUT) +DEFUN(BDB:DBE-CREATE,&key PASSWORD ENCRYPT HOST CLIENT-TIMEOUT SERVER-TIMEOUT) { /* Create an environment handle */ DB_ENV *dbe, *dbe_cl; bool remote_p = boundp(STACK_2); /* host ==> remote */ @@ -526,7 +525,7 @@ #endif DEFFLAGSET(bdb_ac_flags, DB_AUTO_COMMIT) -DEFUN(BDB:DBE-DBREMOVE, dbe file database &key :TRANSACTION :AUTO-COMMIT) +DEFUN(BDB:DBE-DBREMOVE, dbe file database &key TRANSACTION AUTO-COMMIT) { /* remove DATABASE from FILE or the whole FILE */ u_int32_t flags = bdb_ac_flags(); DB_TXN *txn = (DB_TXN*)bdb_handle(popSTACK(),`BDB::TXN`,BH_NIL_IS_NULL); @@ -543,8 +542,7 @@ VALUES0; skipSTACK(3); } -DEFUN(BDB:DBE-DBRENAME, dbe file database newname \ - &key :TRANSACTION :AUTO-COMMIT) +DEFUN(BDB:DBE-DBRENAME, dbe file database newname &key TRANSACTION AUTO-COMMIT) { /* rename DATABASE to NEWNAME in FILE */ u_int32_t flags = bdb_ac_flags(); DB_TXN *txn = (DB_TXN*)bdb_handle(popSTACK(),`BDB::TXN`,BH_NIL_IS_NULL); @@ -567,9 +565,9 @@ type=uint32_t, JOINENV INIT-CDB INIT-LOCK INIT-LOG \ INIT-MPOOL INIT-TXN RECOVER RECOVER-FATAL USE-ENVIRON \ USE-ENVIRON-ROOT CREATE LOCKDOWN PRIVATE SYSTEM-MEM THREAD) -DEFUN(BDB:DBE-OPEN, dbe &key :HOME :FLAGS :JOINENV :INIT-CDB :INIT-LOCK \ - :INIT-LOG :INIT-MPOOL :INIT-TXN :RECOVER :RECOVER-FATAL :USE-ENVIRON \ - :USE-ENVIRON-ROOT :CREATE :LOCKDOWN :PRIVATE :SYSTEM-MEM :THREAD :MODE) +DEFUN(BDB:DBE-OPEN, dbe &key HOME FLAGS JOINENV INIT-CDB INIT-LOCK \ + INIT-LOG INIT-MPOOL INIT-TXN RECOVER RECOVER-FATAL USE-ENVIRON \ + USE-ENVIRON-ROOT CREATE LOCKDOWN PRIVATE SYSTEM-MEM THREAD MODE) { /* open DB environment */ int mode = check_uint_default0(popSTACK()); u_int32_t flags = dbe_open_flags() @@ -583,7 +581,7 @@ } DEFFLAGSET(dbe_remove_flags, DB_FORCE DB_USE_ENVIRON DB_USE_ENVIRON_ROOT) -DEFUN(BDB:DBE-REMOVE, dbe &key :HOME :FORCE :USE-ENVIRON :USE-ENVIRON-ROOT) +DEFUN(BDB:DBE-REMOVE, dbe &key HOME FORCE USE-ENVIRON USE-ENVIRON-ROOT) { /* destroy an environment */ u_int32_t flags = dbe_remove_flags(); DB_ENV *dbe = (DB_ENV*)bdb_handle(STACK_1,`BDB::DBE`,BH_INVALIDATE); @@ -657,16 +655,16 @@ DEFCHECKER(check_lk_detect,prefix=DB_LOCK, default=DB_LOCK_DEFAULT, NORUN \ DEFAULT EXPIRE MAXLOCKS MINLOCKS MINWRITE OLDEST RANDOM YOUNGEST) DEFUN(BDB:DBE-SET-OPTIONS, dbe &key \ - :ERRFILE :ERRPFX :PASSWORD :ENCRYPT :LOCK-TIMEOUT :TXN-TIMEOUT :TIMEOUT \ - :SHM-KEY :TAS-SPINS :TX-TIMESTAMP :TX-MAX :DATA-DIR :TMP-DIR \ - :LG-BSIZE :LG-DIR :LG-MAX :LG-REGIONMAX :NCACHE :CACHESIZE :CACHE \ - :LK-CONFLICTS :LK-DETECT :LK-MAX-LOCKERS :LK-MAX-LOCKS :LK-MAX-OBJECTS \ - :AUTO-COMMIT :CDB-ALLDB :DIRECT-DB :DSYNC-LOG :LOG-AUTOREMOVE \ - :LOG-INMEMORY :DIRECT-LOG :NOLOCKING \ - :NOMMAP :NOPANIC :OVERWRITE :PANIC-ENVIRONMENT :REGION-INIT \ - :TXN-NOSYNC :TXN-WRITE-NOSYNC :YIELDCPU \ - :VERB-CHKPOINT :VERB-DEADLOCK :VERB-RECOVERY :VERB-REPLICATION \ - :VERB-WAITSFOR :VERBOSE :MSGFILE) + ERRFILE ERRPFX PASSWORD ENCRYPT LOCK-TIMEOUT TXN-TIMEOUT TIMEOUT \ + SHM-KEY TAS-SPINS TX-TIMESTAMP TX-MAX DATA-DIR TMP-DIR \ + LG-BSIZE LG-DIR LG-MAX LG-REGIONMAX NCACHE CACHESIZE CACHE \ + LK-CONFLICTS LK-DETECT LK-MAX-LOCKERS LK-MAX-LOCKS LK-MAX-OBJECTS \ + AUTO-COMMIT CDB-ALLDB DIRECT-DB DSYNC-LOG LOG-AUTOREMOVE \ + LOG-INMEMORY DIRECT-LOG NOLOCKING \ + NOMMAP NOPANIC OVERWRITE PANIC-ENVIRONMENT REGION-INIT \ + TXN-NOSYNC TXN-WRITE-NOSYNC YIELDCPU \ + VERB-CHKPOINT VERB-DEADLOCK VERB-RECOVERY VERB-REPLICATION \ + VERB-WAITSFOR :VERBOSE MSGFILE) { /* set many options */ DB_ENV *dbe = (DB_ENV*)bdb_handle(STACK_(48),`BDB::DBE`,BH_VALID); if (!missingp(STACK_0)) reset_msgfile(dbe); @@ -1018,7 +1016,7 @@ restart_DBE_GET_OPTIONS: if (missingp(what)) { /* get everything */ uintL count = 0; - pushSTACK(`:VERBOSE`); value1 = dbe_get_verbose(dbe); + pushSTACK(S(Kverbose)); value1 = dbe_get_verbose(dbe); pushSTACK(value1); count++; pushSTACK(`:CACHE`); dbe_get_cache(dbe,false); pushSTACK(value1); pushSTACK(value2); value1 = listof(2); @@ -1185,7 +1183,7 @@ DB->errx Error message */ -DEFUN(BDB:DB-CREATE, dbe &key :XA) +DEFUN(BDB:DB-CREATE, dbe &key XA) { /* create database */ u_int32_t flags = missingp(STACK_0) ? 0 : DB_XA_CREATE; DB_ENV *dbe = (DB_ENV*)bdb_handle(STACK_1,`BDB::DBE`,BH_NIL_IS_NULL); @@ -1200,7 +1198,7 @@ skipSTACK(2); } -DEFUN(BDB:DB-CLOSE, db &key :NOSYNC) +DEFUN(BDB:DB-CLOSE, db &key NOSYNC) { /* Close a database */ u_int32_t flags = missingp(STACK_0) ? 0 : DB_NOSYNC; DB *db = (DB*)bdb_handle(STACK_1,`BDB::DB`,BH_INVALIDATE); @@ -1373,7 +1371,7 @@ return db_recno_to_I(res); } else { pushSTACK(`BDB::BDB-ERROR`); /* error type */ - pushSTACK(`:CODE`); pushSTACK(NIL); + pushSTACK(S(Kcode)); pushSTACK(NIL); pushSTACK(`"~S: bad logical record number size: ~S should be ~S"`); pushSTACK(TheSubr(subr_self)->name); pushSTACK(uint32_to_I(p_dbt->size)); @@ -1432,7 +1430,7 @@ } } -DEFUN(BDB:DB-DEL, dbe key &key :TRANSACTION :AUTO-COMMIT) +DEFUN(BDB:DB-DEL, dbe key &key TRANSACTION AUTO-COMMIT) { /* Delete items from a database */ u_int32_t flags = bdb_ac_flags(); DB_TXN *txn = (DB_TXN*)bdb_handle(popSTACK(),`BDB::TXN`,BH_NIL_IS_NULL); @@ -1456,8 +1454,8 @@ CONSUME CONSUME-WAIT GET-BOTH SET-RECNO) DEFFLAGSET(db_get_options, DB_AUTO_COMMIT DB_READ_COMMITTED \ DB_READ_UNCOMMITTED DB_MULTIPLE DB_RMW) -DEFUN(BDB:DB-GET, db key &key :ACTION :AUTO-COMMIT :READ-COMMITTED \ - :READ-UNCOMMITTED :MULTIPLE :RMW :TRANSACTION :ERROR :TYPE :KEY-TYPE) +DEFUN(BDB:DB-GET, db key &key ACTION AUTO-COMMIT READ-COMMITTED \ + READ-UNCOMMITTED MULTIPLE RMW TRANSACTION :ERROR :TYPE KEY-TYPE) { /* Get items from a database */ dbt_o_t key_type = check_dbt_type(popSTACK()); dbt_o_t out_type = check_dbt_type(popSTACK()); @@ -1495,7 +1493,7 @@ DEFCHECKER(check_dbtype,enum=DBTYPE,default=DB_UNKNOWN,prefix=DB, \ UNKNOWN BTREE HASH QUEUE RECNO) -DEFUN(BDB:DB-STAT, db &key :FAST-STAT :TRANSACTION) +DEFUN(BDB:DB-STAT, db &key FAST-STAT TRANSACTION) { /* Return database statistics */ DB_TXN *txn = (DB_TXN*)bdb_handle(popSTACK(),`BDB::TXN`,BH_NIL_IS_NULL); #if defined(HAVE_DB_STAT_ACCEPT_TXN) @@ -1590,9 +1588,9 @@ DEFCHECKER(check_db_open_flags,prefix=DB,default=0,bitmasks=both,type=uint32_t,\ CREATE READ-UNCOMMITTED EXCL NOMMAP RDONLY THREAD TRUNCATE \ AUTO-COMMIT) -DEFUN(BDB:DB-OPEN, db file &key :DATABASE :TYPE :MODE :FLAGS \ - :CREATE :READ-UNCOMMITTED :EXCL :NOMMAP :RDONLY :THREAD :TRUNCATE \ - :AUTO-COMMIT :TRANSACTION) +DEFUN(BDB:DB-OPEN, db file &key DATABASE :TYPE MODE FLAGS \ + CREATE READ-UNCOMMITTED EXCL NOMMAP RDONLY THREAD TRUNCATE \ + AUTO-COMMIT TRANSACTION) { /* Open a database */ DB_TXN *txn = (DB_TXN*)bdb_handle(popSTACK(),`BDB::TXN`,BH_NIL_IS_NULL); u_int32_t flags = db_open_flags() | check_db_open_flags_from_list(popSTACK()); @@ -1621,7 +1619,7 @@ VALUES0; } -DEFUN(BDB:DB-TRUNCATE, db &key :TRANSACTION :AUTO-COMMIT) +DEFUN(BDB:DB-TRUNCATE, db &key TRANSACTION AUTO-COMMIT) { /* Empty a database */ u_int32_t flags = bdb_ac_flags(); DB_TXN *txn = (DB_TXN*)bdb_handle(popSTACK(),`BDB::TXN`,BH_NIL_IS_NULL); @@ -1631,7 +1629,7 @@ VALUES1(UL_to_I(count)); } -DEFUN(BDB:DB-UPGRADE, db file &key :DUPSORT) +DEFUN(BDB:DB-UPGRADE, db file &key DUPSORT) { /* Upgrade a database */ u_int32_t flags = (missingp(STACK_0) ? 0 : DB_DUPSORT); DB *db = (DB*)bdb_handle(STACK_2,`BDB::DB`,BH_VALID); @@ -1669,7 +1667,7 @@ } DEFCHECKER(db_put_action,prefix=DB, default=0, APPEND NODUPDATA NOOVERWRITE) -DEFUN(BDB:DB-PUT, db key val &key :AUTO-COMMIT :ACTION :TRANSACTION) +DEFUN(BDB:DB-PUT, db key val &key AUTO-COMMIT ACTION TRANSACTION) { /* Store items into a database */ DB_TXN *txn = (DB_TXN*)bdb_handle(popSTACK(),`BDB::TXN`,BH_NIL_IS_NULL); u_int32_t action = db_put_action(popSTACK()); @@ -1707,7 +1705,7 @@ } DEFFLAGSET(db_join_flags, DB_JOIN_NOSORT) -DEFUN(BDB:DB-JOIN, db cursors &key :JOIN-NOSORT) +DEFUN(BDB:DB-JOIN, db cursors &key JOIN-NOSORT) { /* create a specialized join cursor */ u_int32_t flags = db_join_flags(), length, pos; DB *db = (DB*)bdb_handle(STACK_1,`BDB::DB`,BH_VALID); @@ -1744,7 +1742,7 @@ skipSTACK(2); } -DEFUN(BDB:DB-KEY-RANGE, db key &key :TRANSACTION) +DEFUN(BDB:DB-KEY-RANGE, db key &key TRANSACTION) { /* return an estimate of the proportion of keys that are less than, equal to, and greater than the specified key. The underlying database must be of type Btree. */ @@ -1761,8 +1759,8 @@ } DEFFLAGSET(db_verify_flags, DB_AGGRESSIVE DB_PRINTABLE DB_NOORDERCHK) -DEFUN(BDB:DB-VERIFY, db file &key :DATABASE :SALVAGE :AGGRESSIVE :PRINTABLE \ - :NOORDERCHK) +DEFUN(BDB:DB-VERIFY, db file &key DATABASE SALVAGE AGGRESSIVE PRINTABLE \ + NOORDERCHK) { /* Verify/salvage a database */ u_int32_t flags = db_verify_flags(); DB *db = (DB*)bdb_handle(STACK_3,`BDB::DB`,BH_VALID); @@ -1856,11 +1854,11 @@ return check_db_open_flags_to_list(flags); } -DEFUN(BDB:DB-SET-OPTIONS, db &key :MSGFILE :ERRFILE :ERRPFX :PASSWORD \ - :ENCRYPTION :NCACHE :CACHESIZE :CACHE :LORDER :PAGESIZE :BT-MINKEY \ - :H-FFACTOR :H-NELEM :Q-EXTENTSIZE :RE-DELIM :RE-LEN :RE-PAD :RE-SOURCE \ - :CHKSUM :DUP :DUPSORT :ENCRYPT :INORDER :RECNUM :RENUMBER \ - :REVSPLITOFF :SNAPSHOT :TXN-NOT-DURABLE) +DEFUN(BDB:DB-SET-OPTIONS, db &key MSGFILE ERRFILE ERRPFX PASSWORD \ + ENCRYPTION NCACHE CACHESIZE CACHE LORDER PAGESIZE BT-MINKEY \ + H-FFACTOR H-NELEM Q-EXTENTSIZE RE-DELIM RE-LEN RE-PAD RE-SOURCE \ + CHKSUM DUP DUPSORT ENCRYPT INORDER RECNUM RENUMBER \ + REVSPLITOFF SNAPSHOT TXN-NOT-DURABLE) { /* set database options */ DB *db = (DB*)bdb_handle(STACK_(28),`BDB::DB`,BH_VALID); DB_ENV *dbe = db->get_env(db); @@ -2170,8 +2168,8 @@ /* ===== cursors ===== */ DEFFLAGSET(make_dbc_flags, DB_READ_COMMITTED DB_READ_UNCOMMITTED DB_WRITECURSOR) -DEFUN(BDB:MAKE-DBC,db &key :TRANSACTION :READ-COMMITTED \ - :READ-UNCOMMITTED :WRITECURSOR) +DEFUN(BDB:MAKE-DBC,db &key TRANSACTION READ-COMMITTED \ + READ-UNCOMMITTED WRITECURSOR) { /* create a cursor */ u_int32_t flags = make_dbc_flags(); DB_TXN *txn = (DB_TXN*)bdb_handle(STACK_0,`BDB::TXN`,BH_NIL_IS_NULL); @@ -2212,7 +2210,7 @@ } DEFFLAGSET(dbc_dup_flags, DB_POSITION) -DEFUN(BDB:DBC-DUP, cursor &key :POSITION) +DEFUN(BDB:DBC-DUP, cursor &key POSITION) { /* create a new cursor that uses the same transaction and locker ID as the original cursor */ u_int32_t flags = dbc_dup_flags(); @@ -2234,8 +2232,8 @@ NEXT NEXT-DUP NEXT-NODUP PREV PREV-NODUP SET SET-RANGE SET-RECNO) DEFFLAGSET(dbc_get_options, DB_READ_COMMITTED \ DB_READ_UNCOMMITTED DB_MULTIPLE DB_MULTIPLE_KEY DB_RMW) -DEFUN(BDB:DBC-GET, cursor key data action &key :READ-COMMITTED \ - :READ-UNCOMMITTED :MULTIPLE :MULTIPLE-KEY :RMW :ERROR) +DEFUN(BDB:DBC-GET, cursor key data action &key READ-COMMITTED \ + READ-UNCOMMITTED MULTIPLE MULTIPLE-KEY RMW :ERROR) { /* retrieve key/data pairs from the database */ int no_error = nullp(popSTACK()); u_int32_t flag = dbc_get_options(); @@ -2308,7 +2306,7 @@ DEFCHECKER(check_lockmode, enum=db_lockmode_t, prefix=DB_LOCK, default=, \ NG READ WRITE WAIT IWRITE IREAD IWR READ-UNCOMMITTED WWRITE) DEFFLAGSET(lock_get_flags, DB_LOCK_NOWAIT) -DEFUN(BDB:LOCK-GET, dbe object locker mode &key :NOWAIT) +DEFUN(BDB:LOCK-GET, dbe object locker mode &key NOWAIT) { /* Acquire a lock */ u_int32_t flags = lock_get_flags(); db_lockmode_t mode = check_lockmode(popSTACK()); @@ -2366,7 +2364,7 @@ DB_ENV *dbe = (DB_ENV*)bdb_handle(parent,`BDB::DBE`,BH_INVALID_IS_NULL); if (dbe == NULL) { /* the DBE has been closed */ pushSTACK(`BDB::BDB-ERROR`); /* error type */ - pushSTACK(`:CODE`); pushSTACK(NIL); + pushSTACK(S(Kcode)); pushSTACK(NIL); pushSTACK(CLSTEXT("~S (~S): cannot close a lock whose environment has been already closed; you must re-open the environment and call ~S")); pushSTACK(TheSubr(subr_self)->name); pushSTACK(STACK_5); /* lock */ @@ -2380,7 +2378,7 @@ } DEFFLAGSET(stat_flags, DB_STAT_CLEAR) -DEFUN(BDB:LOCK-STAT,dbe &key :STAT-CLEAR) +DEFUN(BDB:LOCK-STAT,dbe &key STAT-CLEAR) { /* Return lock subsystem statistics */ u_int32_t flags = stat_flags(); DB_ENV *dbe = (DB_ENV*)bdb_handle(popSTACK(),`BDB::DBE`,BH_VALID); @@ -2430,7 +2428,7 @@ DEFFLAGSET(log_archive_flags,DB_ARCH_ABS DB_ARCH_DATA DB_ARCH_LOG \ DB_ARCH_REMOVE) -DEFUN(BDB:LOG-ARCHIVE, dbe &key :ARCH-ABS :ARCH-DATA :ARCH-LOG :ARCH-REMOVE) +DEFUN(BDB:LOG-ARCHIVE, dbe &key ARCH-ABS ARCH-DATA ARCH-LOG ARCH-REMOVE) { /* return a list of log or database filenames. */ u_int32_t flags = log_archive_flags(); DB_ENV *dbe = (DB_ENV*)bdb_handle(popSTACK(),`BDB::DBE`,BH_VALID); @@ -2495,7 +2493,7 @@ make_lsn(&lsn); } -DEFUN(BDB:LOG-STAT, dbe &key :STAT-CLEAR) +DEFUN(BDB:LOG-STAT, dbe &key STAT-CLEAR) { /* logging subsystem statistics */ u_int32_t flags = stat_flags(); DB_ENV *dbe = (DB_ENV*)bdb_handle(popSTACK(),`BDB::DBE`,BH_VALID); @@ -2595,8 +2593,8 @@ DEFFLAGSET(txn_begin_flags, DB_READ_COMMITTED \ DB_READ_UNCOMMITTED DB_TXN_NOSYNC DB_TXN_NOWAIT DB_TXN_SYNC) -DEFUN(BDB:TXN-BEGIN, dbe &key :PARENT :READ-COMMITTED \ - :READ-UNCOMMITTED :NOSYNC :NOWAIT :SYNC) +DEFUN(BDB:TXN-BEGIN, dbe &key PARENT READ-COMMITTED \ + READ-UNCOMMITTED NOSYNC NOWAIT SYNC) { /* create a transaction */ u_int32_t flags = txn_begin_flags(); DB_TXN *parent = (DB_TXN*)bdb_handle(STACK_0,`BDB::TXN`,BH_NIL_IS_NULL), *ret; @@ -2621,7 +2619,7 @@ } DEFCHECKER(txn_check_sync,prefix=DB_TXN,default=0, NOSYNC SYNC) -DEFUN(BDB:TXN-COMMIT, txn &key :SYNC) +DEFUN(BDB:TXN-COMMIT, txn &key SYNC) { /* Commit a transaction */ u_int32_t flags = txn_check_sync(popSTACK()); DB_TXN *txn = (DB_TXN*)bdb_handle(STACK_0,`BDB::TXN`,BH_INVALIDATE); @@ -2651,7 +2649,7 @@ } DEFFLAGSET(txn_checkpoint_flags, DB_FORCE) -DEFUN(BDB:TXN-CHECKPOINT, dbe &key :KBYTE :MIN :FORCE) +DEFUN(BDB:TXN-CHECKPOINT, dbe &key KBYTE MIN FORCE) { /* flush the underlying memory pool, write a checkpoint record to the log, and then flush the log. */ u_int32_t flags = txn_checkpoint_flags(); @@ -2692,7 +2690,7 @@ } DEFFLAGSET(txn_recover_flags, DB_FIRST DB_NEXT) -DEFUN(BDB:TXN-RECOVER, dbe &key :FIRST :NEXT) +DEFUN(BDB:TXN-RECOVER, dbe &key FIRST NEXT) { /* return a list of prepared but not yet resolved transactions */ u_int32_t flags = txn_recover_flags(); DB_ENV *dbe = (DB_ENV*)bdb_handle(popSTACK(),`BDB::DBE`,BH_VALID); @@ -2732,7 +2730,7 @@ VALUES0; } -DEFUN(BDB:TXN-STAT, dbe &key :STAT-CLEAR) +DEFUN(BDB:TXN-STAT, dbe &key STAT-CLEAR) { /* transaction subsystem statistics */ u_int32_t flags = stat_flags(); DB_ENV *dbe = (DB_ENV*)bdb_handle(popSTACK(),`BDB::DBE`,BH_VALID); ------------------------------ ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ ------------------------------ _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest, Vol 22, Issue 29 ***************************************** |