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

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

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

Modified Files:
	nsclamav.c 
Log Message:
compiler warnings silence


Index: nsclamav.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsclamav/nsclamav.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nsclamav.c	8 Jun 2005 20:03:40 -0000	1.2
--- nsclamav.c	12 Jun 2005 22:34:22 -0000	1.3
***************
*** 59,70 ****
      path = Ns_ConfigGetPath(server,module,NULL);
  
!     if(!(db = Ns_ConfigGet(path,"dbdir"))) db = cl_retdbdir();
      if((rc = cl_loaddbdir(db,&ClamAvRoot,&virnum))) {
        Ns_Log(Error,"nsclamav: failed to load db: %s",cl_strerror(rc));
        return NS_ERROR;
      }
!     if((rc = cl_buildtrie(ClamAvRoot))) {
        Ns_Log(Error,"nsclamav: failed to build trie: %s",cl_strerror(rc));
!       cl_freetrie(ClamAvRoot);
        return NS_ERROR;
      }
--- 59,70 ----
      path = Ns_ConfigGetPath(server,module,NULL);
  
!     if(!(db = Ns_ConfigGet(path,"dbdir"))) db = (char*)cl_retdbdir();
      if((rc = cl_loaddbdir(db,&ClamAvRoot,&virnum))) {
        Ns_Log(Error,"nsclamav: failed to load db: %s",cl_strerror(rc));
        return NS_ERROR;
      }
!     if((rc = cl_build(ClamAvRoot))) {
        Ns_Log(Error,"nsclamav: failed to build trie: %s",cl_strerror(rc));
!       cl_free(ClamAvRoot);
        return NS_ERROR;
      }
***************
*** 89,93 ****
  ClamAvCmd(void *context,Tcl_Interp *interp,int objc,Tcl_Obj * CONST objv[])
  {
!     int rc;
      char *buf;
      const char *virname;
--- 89,93 ----
  ClamAvCmd(void *context,Tcl_Interp *interp,int objc,Tcl_Obj * CONST objv[])
  {
!     int rc,cmd,bsize;
      char *buf;
      const char *virname;
***************
*** 97,103 ****
          cmdScanBuff,
          cmdScanFile
!     } cmd;
        
!     static char *sCmd[] = {
          "scanbuff",
          "scanfile",
--- 97,103 ----
          cmdScanBuff,
          cmdScanFile
!     };
        
!     static const char *sCmd[] = {
          "scanbuff",
          "scanfile",
***************
*** 106,110 ****
  
      if(objc < 3) {
!       Tcl_AppendResult(interp, "wrong # args: should be ns_savi command ?args ...?",0);
        return TCL_ERROR;
      }
--- 106,110 ----
  
      if(objc < 3) {
!       Tcl_AppendResult(interp, "wrong # args: should be ns_clamav command ?args ...?",0);
        return TCL_ERROR;
      }
***************
*** 114,119 ****
      switch(cmd) {
       case cmdScanBuff:
!         buf = Tcl_GetStringFromObj(objv[2],(int*)&size);
!         rc = cl_scanbuff(buf,size,&virname,ClamAvRoot);
          switch(rc) {
           case CL_VIRUS:
--- 114,119 ----
      switch(cmd) {
       case cmdScanBuff:
!         buf = Tcl_GetStringFromObj(objv[2],(int*)&bsize);
!         rc = cl_scanbuff(buf,bsize,&virname,ClamAvRoot);
          switch(rc) {
           case CL_VIRUS: