[naviserver-commits] modules/nsdbpg ChangeLog,1.5,1.6 tclcmds.c,1.3,1.4

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

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

Modified Files:
	ChangeLog tclcmds.c 
Log Message:


Index: tclcmds.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsdbpg/tclcmds.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tclcmds.c	1 Aug 2005 19:32:22 -0000	1.3
--- tclcmds.c	8 Aug 2005 15:16:02 -0000	1.4
***************
*** 311,317 ****
              return TCL_ERROR;       
          }
!         sql = Ns_StrDup(argv[5]);
      } else {
!         sql = Ns_StrDup(argv[3]);
      }
  
--- 311,317 ----
              return TCL_ERROR;       
          }
!         sql = ns_strdup(argv[5]);
      } else {
!         sql = ns_strdup(argv[3]);
      }
  
***************
*** 353,357 ****
                      string_list_free_list(bind_variables);
                      string_list_free_list(sql_fragments);
!                     Ns_Free(sql);
                      return TCL_ERROR;
                  }
--- 353,357 ----
                      string_list_free_list(bind_variables);
                      string_list_free_list(sql_fragments);
!                     ns_free(sql);
                      return TCL_ERROR;
                  }
***************
*** 404,408 ****
          }
  
!         Ns_Free(sql);
          sql = Ns_DStringExport(&ds);
          Ns_DStringFree(&ds);
--- 404,408 ----
          }
  
!         ns_free(sql);
          sql = Ns_DStringExport(&ds);
          Ns_DStringFree(&ds);
***************
*** 459,463 ****
          return DbFail(interp, handle, cmd, sql);    
      }
!     Ns_Free(sql);
  
      return TCL_OK;
--- 459,463 ----
          return DbFail(interp, handle, cmd, sql);    
      }
!     ns_free(sql);
  
      return TCL_OK;
***************
*** 507,511 ****
      Tcl_AppendResult(interp, "\nSQL: ", sql, NULL);
  
!     Ns_Free(sql);
  
      return TCL_ERROR;
--- 507,511 ----
      Tcl_AppendResult(interp, "\nSQL: ", sql, NULL);
  
!     ns_free(sql);
  
      return TCL_ERROR;
***************
*** 573,579 ****
      int first_bind = 0;
  
!     fragbuf = (char*)Ns_Malloc((strlen(input)+1)*sizeof(char));
      fp = fragbuf;
!     bindbuf = (char*)Ns_Malloc((strlen(input)+1)*sizeof(char));
      bp = bindbuf;
  
--- 573,579 ----
      int first_bind = 0;
  
!     fragbuf = (char*)ns_malloc((strlen(input)+1)*sizeof(char));
      fp = fragbuf;
!     bindbuf = (char*)ns_malloc((strlen(input)+1)*sizeof(char));
      bp = bindbuf;
  
***************
*** 590,594 ****
                  state = bind;
                  *fp = '\0';
!                 felt = string_list_elt_new(Ns_StrDup(fragbuf));
                  if(ftail == 0) {
                      fhead = ftail = felt;
--- 590,594 ----
                  state = bind;
                  *fp = '\0';
!                 felt = string_list_elt_new(ns_strdup(fragbuf));
                  if(ftail == 0) {
                      fhead = ftail = felt;
***************
*** 617,621 ****
              } else if (!(*p == '_' || *p == '$' || *p == '#' || isalnum((int)*p))) {
                  *bp = '\0';
!                 elt = string_list_elt_new(Ns_StrDup(bindbuf));
                  if (tail == 0) {
                      head = tail = elt;
--- 617,621 ----
              } else if (!(*p == '_' || *p == '$' || *p == '#' || isalnum((int)*p))) {
                  *bp = '\0';
!                 elt = string_list_elt_new(ns_strdup(bindbuf));
                  if (tail == 0) {
                      head = tail = elt;
***************
*** 636,640 ****
      if (state == bind) {
          *bp = '\0';
!         elt = string_list_elt_new(Ns_StrDup(bindbuf));
          if (tail == 0) {
              head = tail = elt;
--- 636,640 ----
      if (state == bind) {
          *bp = '\0';
!         elt = string_list_elt_new(ns_strdup(bindbuf));
          if (tail == 0) {
              head = tail = elt;
***************
*** 645,649 ****
      } else {
          *fp = '\0';
!         felt = string_list_elt_new(Ns_StrDup(fragbuf));
          if (ftail == 0) {
              fhead = ftail = felt;
--- 645,649 ----
      } else {
          *fp = '\0';
!         felt = string_list_elt_new(ns_strdup(fragbuf));
          if (ftail == 0) {
              fhead = ftail = felt;
***************
*** 654,659 ****
      }
  
!     Ns_Free(fragbuf);
!     Ns_Free(bindbuf);
      *bind_variables = head;
      *fragments      = fhead;  
--- 654,659 ----
      }
  
!     ns_free(fragbuf);
!     ns_free(bindbuf);
      *bind_variables = head;
      *fragments      = fhead;  

Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/modules/nsdbpg/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ChangeLog	1 Aug 2005 19:32:22 -0000	1.5
--- ChangeLog	8 Aug 2005 15:16:01 -0000	1.6
***************
*** 1,2 ****
--- 1,6 ----
+ 2005-08-09  Vlad Seryakov  <ser...@us...>
+ 
+ 	* tclcmds.c: changed to stop using old Ns_ functions
+ 
  2005-08-01  Vlad Seryakov  <ser...@us...>