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

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

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

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


Index: nsimap.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsimap/nsimap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nsimap.c	8 Jun 2005 20:03:47 -0000	1.2
--- nsimap.c	12 Jun 2005 22:34:23 -0000	1.3
***************
*** 408,412 ****
  {
      if(!session) return;
!     if(server->debug) Ns_Log(Debug,"ns_imap: free: 0x%x: %d",session,session->id);
  
      /* Call atclose Tcl handler */
--- 408,412 ----
  {
      if(!session) return;
!     if(server->debug) Ns_Log(Debug,"ns_imap: free: 0x%p: %ld",session,session->id);
  
      /* Call atclose Tcl handler */
***************
*** 486,490 ****
        if(!strcmp(cmd,"-shortcache")) flags |= OP_SHORTCACHE;
      }
!     if(server->debug) Ns_Log(Debug,"ns_imap: open: 0x%x: %d: %s: %s",session,session->id,session->mailbox,session->user);
      Ns_TlsSet(&mailTls,session);
      if(!session->mailbox || !(session->stream = mail_open(session->stream,session->mailbox,flags))) {
--- 486,490 ----
        if(!strcmp(cmd,"-shortcache")) flags |= OP_SHORTCACHE;
      }
!     if(server->debug) Ns_Log(Debug,"ns_imap: open: 0x%p: %ld: %s: %s",session,session->id,session->mailbox,session->user);
      Ns_TlsSet(&mailTls,session);
      if(!session->mailbox || !(session->stream = mail_open(session->stream,session->mailbox,flags))) {
***************
*** 712,716 ****
        if(now - session->access_time > idle_timeout) {
          mailSession *next = session->next;
!         Ns_Log(Notice,"ns_imap: GC: inactive session %d: %s",session->id,session->stream->mailbox);
          Ns_TlsSet(&mailTls,session);
          /* In case of panic we will be thrown here again */
--- 712,716 ----
        if(now - session->access_time > idle_timeout) {
          mailSession *next = session->next;
!         Ns_Log(Notice,"ns_imap: GC: inactive session %ld: %s",session->id,session->stream->mailbox);
          Ns_TlsSet(&mailTls,session);
          /* In case of panic we will be thrown here again */
***************
*** 740,744 ****
  MailCmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[])
  {
!     int index;
      unsigned int num;
      mailSession *session = 0;
--- 740,744 ----
  MailCmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[])
  {
!     int index,cmd;
      unsigned int num;
      mailSession *session = 0;
***************
*** 755,761 ****
          cmdUnsubscribe, cmdNmsgs, cmdNrecent, cmdSort, cmdBodyStruct, cmdUid,
          cmdHeader, cmdGetParam, cmdSetParam, cmdSetQuota, cmdGetQuota, cmdSetAcl
!     } cmd;
  
!     static char *sCmd[] = {
          "gc", "sessions", "decode", "encode", "parsedate", "striphtml",
          "open",
--- 755,761 ----
          cmdUnsubscribe, cmdNmsgs, cmdNrecent, cmdSort, cmdBodyStruct, cmdUid,
          cmdHeader, cmdGetParam, cmdSetParam, cmdSetQuota, cmdGetQuota, cmdSetAcl
!     };
  
!     static const char *sCmd[] = {
          "gc", "sessions", "decode", "encode", "parsedate", "striphtml",
          "open",
***************
*** 854,858 ****
          // Decode text into plain 8bit string
          char *data;
!         unsigned long len = 0;
          if(objc < 4) {
            Tcl_AppendResult(interp, "wrong # args: should be ns_imap ",sCmd[cmd]," type text",0);
--- 854,858 ----
          // Decode text into plain 8bit string
          char *data;
!         int len = 0;
          if(objc < 4) {
            Tcl_AppendResult(interp, "wrong # args: should be ns_imap ",sCmd[cmd]," type text",0);
***************
*** 864,868 ****
            data = (char *)rfc822_base64(data,num=len,&len);
            Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(data,(int)len));
!           fs_give((void**)&data);
            return TCL_OK;
          } else
--- 864,868 ----
            data = (char *)rfc822_base64(data,num=len,&len);
            Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(data,(int)len));
!           fs_give(&data);
            return TCL_OK;
          } else
***************
*** 871,880 ****
            data = (char *)rfc822_qprint(data,num=len,&len);
            Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(data,(int)len));
!           fs_give((void**)&data);
            return TCL_OK;
          } else
          // Convert a UTF7 an 8-bit string */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"utf7")) {
!           if((data = utf7_decode(data,(int)num=len,(int*)&len))) {
              Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(data,(int)len));
              ns_free(data);
--- 871,880 ----
            data = (char *)rfc822_qprint(data,num=len,&len);
            Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(data,(int)len));
!           fs_give(&data);
            return TCL_OK;
          } else
          // Convert a UTF7 an 8-bit string */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"utf7")) {
!           if((data = utf7_decode(data,(int)(num=len),(int*)&len))) {
              Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(data,(int)len));
              ns_free(data);
***************
*** 888,892 ****
          // Encode plain 8bit string
          char *data;
!         unsigned long len = 0;
          if(objc < 4) {
            Tcl_AppendResult(interp, "wrong # args: should be ns_imap ",sCmd[cmd]," type text",0);
--- 888,892 ----
          // Encode plain 8bit string
          char *data;
!         int len = 0;
          if(objc < 4) {
            Tcl_AppendResult(interp, "wrong # args: should be ns_imap ",sCmd[cmd]," type text",0);
***************
*** 898,902 ****
            data = (char *)rfc822_8bit(data,num=len,&len);
            Tcl_SetObjResult(interp,Tcl_NewStringObj(data,(int)len));
!           fs_give((void**)&data);
            return TCL_OK;
          } else
--- 898,902 ----
            data = (char *)rfc822_8bit(data,num=len,&len);
            Tcl_SetObjResult(interp,Tcl_NewStringObj(data,(int)len));
!           fs_give(&data);
            return TCL_OK;
          } else
***************
*** 905,914 ****
            data = (char *)rfc822_binary(data,num=len,&len);
            Tcl_SetObjResult(interp,Tcl_NewStringObj(data,(int)len));
!           fs_give((void**)&data);
            return TCL_OK;
          } else
          // Convert a 8-bit string into UTF7 */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"utf7")) {
!           if((data = utf7_encode(data,(int)num=len,(int*)&len))) {
              Tcl_SetObjResult(interp,Tcl_NewStringObj(data,(int)len));
              ns_free(data);
--- 905,914 ----
            data = (char *)rfc822_binary(data,num=len,&len);
            Tcl_SetObjResult(interp,Tcl_NewStringObj(data,(int)len));
!           fs_give(&data);
            return TCL_OK;
          } else
          // Convert a 8-bit string into UTF7 */
          if(!strcmp(Tcl_GetStringFromObj(objv[2],0),"utf7")) {
!           if((data = utf7_encode(data,(int)(num=len),(int*)&len))) {
              Tcl_SetObjResult(interp,Tcl_NewStringObj(data,(int)len));
              ns_free(data);
***************
*** 1213,1217 ****
               Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(text,(int)len));
          }
!         if(data) fs_give((void**)&data);
          break;
      }
--- 1213,1217 ----
               Tcl_SetObjResult(interp,Tcl_NewByteArrayObj(text,(int)len));
          }
!         if(data) fs_give(&data);
          break;
      }
***************
*** 1412,1416 ****
            for(id = ids;*id;id++)
              Tcl_ListObjAppendElement(interp,session->list,Tcl_NewIntObj((int)*id));
!           fs_give((void**)&ids);
            Tcl_SetObjResult(interp,session->list);
          }
--- 1412,1416 ----
            for(id = ids;*id;id++)
              Tcl_ListObjAppendElement(interp,session->list,Tcl_NewIntObj((int)*id));
!           fs_give(&ids);
            Tcl_SetObjResult(interp,session->list);
          }
***************
*** 1652,1656 ****
           ns_free(session->error);
           session->error = ns_strcopy(string);
!          Ns_Log(Error,"ns_imap: [%d]: %s",session->id,string);
           break;
       }
--- 1652,1656 ----
           ns_free(session->error);
           session->error = ns_strcopy(string);
!          Ns_Log(Error,"ns_imap: [%ld]: %s",session->id,string);
           break;
       }