[srvx-commits] CVS: services/src saxdb.c,1.5,1.6

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv9963/src

Modified Files:
	saxdb.c 
Log Message:
make saxdb_pre_object() way simpler
indent closing } of an object as much as opening name, not as much as object contents


Index: saxdb.c
===================================================================
RCS file: /cvsroot/srvx/services/src/saxdb.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** saxdb.c	17 Aug 2002 14:31:15 -0000	1.5
--- saxdb.c	17 Aug 2002 20:59:40 -0000	1.6
***************
*** 181,195 ****
  static void
  saxdb_pre_object(struct saxdb_context *dest) {
-     char indent[64];
      unsigned int ii;
! 
!     if (!dest->indent) return;
!     memset(indent, '\t', sizeof(indent)-1);
!     indent[sizeof(indent)-1] = 0;
!     for (ii = 0; ii + sizeof(indent) >= dest->indent; ii += sizeof(indent)-1) {
!         saxdb_put_string(dest, indent);
!     }
!     indent[dest->indent - ii] = 0;
!     saxdb_put_string(dest, indent);
  }
  #else
--- 181,186 ----
  static void
  saxdb_pre_object(struct saxdb_context *dest) {
      unsigned int ii;
!     for (ii=0; ii<dest->indent; ++ii) saxdb_put_char(dest, '\t');
  }
  #else
***************
*** 218,224 ****
  saxdb_end_record(struct saxdb_context *dest) {
      assert(dest->complex.used > 0);
-     saxdb_pre_object(dest);
      if (COMPLEX(dest)) dest->indent--;
      dest->complex.used--;
      saxdb_put_char(dest, '}');
      saxdb_post_object(dest);
--- 209,215 ----
  saxdb_end_record(struct saxdb_context *dest) {
      assert(dest->complex.used > 0);
      if (COMPLEX(dest)) dest->indent--;
      dest->complex.used--;
+     saxdb_pre_object(dest);
      saxdb_put_char(dest, '}');
      saxdb_post_object(dest);