[naviserver-commits] modules/nsberkeleydb nsberkeleydb.c,1.2,1.3

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsberkeleydb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2950/nsberkeleydb

Modified Files:
	nsberkeleydb.c 
Log Message:
silenced more compiler warnings


Index: nsberkeleydb.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsberkeleydb/nsberkeleydb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nsberkeleydb.c	8 Jun 2005 20:03:38 -0000	1.2
--- nsberkeleydb.c	13 Jun 2005 16:04:31 -0000	1.3
***************
*** 55,59 ****
  static int      DbFree(Ns_DbHandle *handle);
  static int      DbShutdown(void *arg);
! static void     DbError(const char *errpfx, char *msg);
  static Ns_Set  *DbBindRow(Ns_DbHandle *handle);
  
--- 55,59 ----
  static int      DbFree(Ns_DbHandle *handle);
  static int      DbShutdown(void *arg);
! static void     DbError(const DB_ENV *env,const char *errpfx, const char *msg);
  static Ns_Set  *DbBindRow(Ns_DbHandle *handle);
  
***************
*** 153,157 ****
      }
      Ns_RegisterShutdown((Ns_Callback *)DbShutdown,0);
!     Ns_Log(Notice,"%s/%s: Home=%s, Cache=%ld, Flags=%x",dbName,hModule,dbHome,dbCacheSize,dbEnvFlags);
      Ns_DStringFree(&ds);
      return NS_OK;
--- 153,157 ----
      }
      Ns_RegisterShutdown((Ns_Callback *)DbShutdown,0);
!     Ns_Log(Notice,"%s/%s: Home=%s, Cache=%ud, Flags=%x",dbName,hModule,dbHome,dbCacheSize,dbEnvFlags);
      Ns_DStringFree(&ds);
      return NS_OK;
***************
*** 210,214 ****
      if(dbDbFlags) db->set_flags(db,dbDbFlags);
      if(dbPageSize) db->set_pagesize(db,dbPageSize);
!     if((rc = db->open(db,dbpath,0,dbtype,DB_CREATE|DB_THREAD|DB_DIRTY_READ,0664,0)) != 0) {
        db->err(db,rc,"%s: open",handle->datasource);
        db->close(db,0);
--- 210,214 ----
      if(dbDbFlags) db->set_flags(db,dbDbFlags);
      if(dbPageSize) db->set_pagesize(db,dbPageSize);
!     if((rc = db->open(db,0,dbpath,0,dbtype,DB_CREATE|DB_THREAD|DB_DIRTY_READ,0664)) != 0) {
        db->err(db,rc,"%s: open",handle->datasource);
        db->close(db,0);
***************
*** 278,282 ****
        conn->key.data = query+4;
        if((conn->data.data = strstr(conn->key.data,dbDelimiter))) {
!         *((char*)conn->data.data)++ = 0;
          conn->data.size = strlen(conn->data.data)+1;
        }
--- 278,282 ----
        conn->key.data = query+4;
        if((conn->data.data = strstr(conn->key.data,dbDelimiter))) {
!         *((char*)conn->data.data++) = 0;
          conn->data.size = strlen(conn->data.data)+1;
        }
***************
*** 420,424 ****
  
  static void
! DbError(const char *errpfx, char *msg)
  {
       Ns_Log(Error,"nsberkeleydb: %s: %s",errpfx,msg);
--- 420,424 ----
  
  static void
! DbError(const DB_ENV *env,const char *errpfx, const char *msg)
  {
       Ns_Log(Error,"nsberkeleydb: %s: %s",errpfx,msg);
***************
*** 484,488 ****
  
  static int
! DbCmd(ClientData dummy, Tcl_Interp *interp, int argc, char **argv)
  {
      Ns_DbHandle *handle;
--- 484,488 ----
  
  static int
! DbCmd(ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)
  {
      Ns_DbHandle *handle;
***************
*** 492,496 ****
        return TCL_ERROR;
      }
!     if(Ns_TclDbGetHandle(interp,argv[2],&handle) != TCL_OK) return TCL_ERROR;
      /* Make sure this is an Db handle before accessing handle->connection. */
      if(Ns_DbDriverName(handle) != dbName) {
--- 492,496 ----
        return TCL_ERROR;
      }
!     if(Ns_TclDbGetHandle(interp,(char*)argv[2],&handle) != TCL_OK) return TCL_ERROR;
      /* Make sure this is an Db handle before accessing handle->connection. */
      if(Ns_DbDriverName(handle) != dbName) {