[naviserver-commits] naviserver/nsd return.c,1.10,1.11

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9380/nsd

Modified Files:
	return.c 
Log Message:
Clean up some string buffer usage.


Index: return.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/return.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** return.c	6 Jul 2005 07:12:18 -0000	1.10
--- return.c	6 Jul 2005 09:15:44 -0000	1.11
***************
*** 203,213 ****
  Ns_ConnConstructHeaders(Ns_Conn *conn, Ns_DString *dsPtr)
  {
      int   i, length;
      char *reason;
-     char  buf[100];
      char *value, *keep;
      char *key, *lengthHdr;
-     Conn *connPtr;
-     Driver *drvPtr;
      int  doChunkEncoding = 0;
  
--- 203,212 ----
  Ns_ConnConstructHeaders(Ns_Conn *conn, Ns_DString *dsPtr)
  {
+     Conn *connPtr = (Conn *) conn;
+     Driver *drvPtr  = (Driver *) connPtr->drvPtr;
      int   i, length;
      char *reason;
      char *value, *keep;
      char *key, *lengthHdr;
      int  doChunkEncoding = 0;
  
***************
*** 216,236 ****
       */
  
-     connPtr = (Conn *) conn;
-     drvPtr = connPtr->drvPtr;
-     sprintf(buf, "%d", connPtr->responseStatus);
      reason = "Unknown Reason";
      for (i = 0; i < nreasons; i++) {
! 	if (reasons[i].status == connPtr->responseStatus) {
! 	    reason = reasons[i].reason;
! 	    break;
! 	}
      }
- 
      doChunkEncoding = IsSetupForChunkedEncoding(conn);
  
!     if (!doChunkEncoding)
!         Ns_DStringVarAppend(dsPtr, "HTTP/1.0 ", buf, " ", reason, "\r\n", NULL);
!     else
!         Ns_DStringVarAppend(dsPtr, "HTTP/1.1 ", buf, " ", reason, "\r\n", NULL);
  
      /*
--- 215,231 ----
       */
  
      reason = "Unknown Reason";
      for (i = 0; i < nreasons; i++) {
!         if (reasons[i].status == connPtr->responseStatus) {
!             reason = reasons[i].reason;
!             break;
!         }
      }
      doChunkEncoding = IsSetupForChunkedEncoding(conn);
  
!     Ns_DStringPrintf(dsPtr, "HTTP/%s %d %s\r\n",
!                      doChunkEncoding ? "1.1" : "1.0",
!                      connPtr->responseStatus,
!                      reason);
  
      /*
***************
*** 543,553 ****
  Ns_ConnSetLengthHeader(Ns_Conn *conn, int length)
  {
!     char  buf[100];
!     Conn *connPtr;
  
-     connPtr = (Conn *) conn;
      connPtr->responseLength = length;
!     sprintf(buf, "%d", length);
!     Ns_ConnSetHeaders(conn, "Content-Length", buf);
  }
  
--- 538,545 ----
  Ns_ConnSetLengthHeader(Ns_Conn *conn, int length)
  {
!     Conn *connPtr = (Conn *) conn;
  
      connPtr->responseLength = length;
!     Ns_ConnPrintfHeaders(conn, "Content-Length", "%d", length);
  }