[naviserver-commits] naviserver/nsd tclobjv.c,1.9,1.10

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

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

Modified Files:
	tclobjv.c 
Log Message:
Simplify code and clarify comment.


Index: tclobjv.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/tclobjv.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tclobjv.c	10 Jun 2005 17:58:40 -0000	1.9
--- tclobjv.c	13 Jun 2005 04:32:28 -0000	1.10
***************
*** 294,302 ****
  
      if (*objcPtr > 0) {
!         if (spec->arg == NULL) {
!             *dest = Tcl_GetString(objv[0]);
!         } else {
!             *dest = Tcl_GetStringFromObj(objv[0], (int *) spec->arg);
!         }
          *objcPtr -= 1;
          return TCL_OK;
--- 294,298 ----
  
      if (*objcPtr > 0) {
!         *dest = Tcl_GetStringFromObj(objv[0], (int *) spec->arg);
          *objcPtr -= 1;
          return TCL_OK;
***************
*** 311,319 ****
   * Ns_ObjvByteArray --
   *
!  *      Consume exactly one argument, returning a pointer to it's
!  *      cstring into *spec->dest.
   *
   *      If spec->arg is != NULL it is assumed to be a pointer to an
!  *      int and the returned string length will be left in it.
   *
   * Results:
--- 307,315 ----
   * Ns_ObjvByteArray --
   *
!  *      Consume exactly one argument, returning a pointer to the
!  *      raw bytes into *spec->dest.
   *
   *      If spec->arg is != NULL it is assumed to be a pointer to an
!  *      int and the number of bytes will be left in it.
   *
   * Results:
***************
*** 333,341 ****
  
      if (*objcPtr > 0) {
!         if (spec->arg == NULL) {
!             *dest = Tcl_GetByteArrayFromObj(objv[0],0);
!         } else {
!             *dest = Tcl_GetByteArrayFromObj(objv[0], (int *) spec->arg);
!         }
          *objcPtr -= 1;
          return TCL_OK;
--- 329,333 ----
  
      if (*objcPtr > 0) {
!         *dest = Tcl_GetByteArrayFromObj(objv[0], (int *) spec->arg);
          *objcPtr -= 1;
          return TCL_OK;