[gq-commit] gq/src browse-dnd.c,1.20,1.21 browse.c,1.93,1.94 browse.h,1.37,1.38 configfile.c,1.50,1.51 configfile.h,1.36,1.37 debug.c,1.9,1.10 debug.h,1.8,1.9 dt_binary.c,1.16,1.17 dt_generic_binary.c,1.13,1.14 dt_oc.c,1.20,1.21 dt_password.c,1.21,1.22 dt_time.c,1.11,1.12 dtutil.c,1.4,1.5 filter.c,1.26,1.27 filter.h,1.5,1.6 formfill.c,1.44,1.45 formfill.h,1.29,1.30 gq-xml.c,1.11,1.12 input.c,1.81,1.82 ldapops.c,1.21,1.22 mainwin.c,1.54,1.55 mainwin.h,1.24,1.25 prefs.c,1.54,1.55 ref-browse.c,1.9,1.10 schema.c,1.26,1.27 schemabrowse.c,1.27,1.28 search.c,1.61,1.62 search.h,1.17,1.18 state.c,1.11,1.12 syntax.c,1.20,1.21 syntax.h,1.10,1.11 template.c,1.14,1.15 template.h,1.6,1.7 util.c,1.86,1.87 util.h,1.29,1.30 xmlparse.c,1.7,1.8

[<sta...@us...>]

Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv32757/src

Modified Files:
	browse-dnd.c browse.c browse.h configfile.c configfile.h 
	debug.c debug.h dt_binary.c dt_generic_binary.c dt_oc.c 
	dt_password.c dt_time.c dtutil.c filter.c filter.h formfill.c 
	formfill.h gq-xml.c input.c ldapops.c mainwin.c mainwin.h 
	prefs.c ref-browse.c schema.c schemabrowse.c search.c search.h 
	state.c syntax.c syntax.h template.c template.h util.c util.h 
	xmlparse.c 
Log Message:
* Improved code quality by trying out many gcc warning option to find
  potential problems:
  - hiding of global/local variables in some scope
  - Added many const keywords where appropriate and useful
  - Cleaned up some header files and made many functions static
  - took care of some signed/unsigned situations
  - some minor cosmetic changes
  - added some missing initialization values
  - Use some more warning options permanently with gcc


Index: browse-dnd.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/browse-dnd.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** browse-dnd.c	2 Nov 2003 07:20:42 -0000	1.20
--- browse-dnd.c	3 Nov 2003 21:07:56 -0000	1.21
***************
*** 189,193 ****
  				  67, 100, 200 };
  
!      if (distance >= (sizeof(intervalmap) / sizeof(intervalmap[0])) ||
  	 distance < 0) {
  	  return 200;
--- 189,193 ----
  				  67, 100, 200 };
  
!      if (distance >= (int) (sizeof(intervalmap) / sizeof(intervalmap[0])) ||
  	 distance < 0) {
  	  return 200;

Index: browse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/browse.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** browse.c	2 Nov 2003 17:23:49 -0000	1.93
--- browse.c	3 Nov 2003 21:07:56 -0000	1.94
***************
*** 244,248 ****
  }
  
! 
  void add_single_server(struct tab *tab, struct ldapserver *server)
  {
--- 244,248 ----
  }
  
! #if DEAD_CODE
  void add_single_server(struct tab *tab, struct ldapserver *server)
  {
***************
*** 253,257 ****
  
  }
! 
  
  /*
--- 253,257 ----
  
  }
! #endif
  
  /*
***************
*** 277,281 ****
  
  /* GTK callbacks translating to the correct entry object method calls */
! void tree_row_expanded(GtkCTree *ctree, GtkCTreeNode *ctree_node, struct tab *tab)
  {
       browse_entry *entry;
--- 277,283 ----
  
  /* GTK callbacks translating to the correct entry object method calls */
! static void tree_row_expanded(GtkCTree *ctree,
! 			      GtkCTreeNode *ctree_node,
! 			      struct tab *tab)
  {
       browse_entry *entry;
***************
*** 297,302 ****
  
  
! void tree_row_selected(GtkCTree *ctree, GtkCTreeNode *node,
! 		       int column, struct tab *tab)
  {
       browse_entry *entry;
--- 299,304 ----
  
  
! static void tree_row_selected(GtkCTree *ctree, GtkCTreeNode *node,
! 			      int column, struct tab *tab)
  {
       browse_entry *entry;
***************
*** 1013,1019 ****
  			 if (e) {
  			      /* have it!! */
! 			      char *dn = ldap_get_dn(ld, e);
! 			      found = dn_browse_single_add(dn, tree, node);
! 			      if (dn) ldap_memfree(dn);
  
  			      node = found;
--- 1015,1021 ----
  			 if (e) {
  			      /* have it!! */
! 			      char *dn2 = ldap_get_dn(ld, e);
! 			      found = dn_browse_single_add(dn2, tree, node);
! 			      if (dn2) ldap_memfree(dn2);
  
  			      node = found;

Index: browse.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/browse.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** browse.h	2 Nov 2003 07:20:43 -0000	1.37
--- browse.h	3 Nov 2003 21:07:56 -0000	1.38
***************
*** 54,61 ****
  };
  
- 
- struct ldapserver *server_from_node(GtkCTree *ctreeroot, 
- 				    GtkCTreeNode *node);
- 
  struct browse_entry_vtab;
  
--- 54,57 ----
***************
*** 124,128 ****
  
  
! void record_path(struct tab *tab, browse_entry *entry, 
  		 GtkCTree *ctreeroot, GtkCTreeNode *node);
  
--- 120,124 ----
  
  
! void record_path(struct tab *tab, browse_entry *entry,
  		 GtkCTree *ctreeroot, GtkCTreeNode *node);
  
***************
*** 132,161 ****
  
  /* get the server object for the current entry */
! struct ldapserver *server_from_node(GtkCTree *ctreeroot, 
  				    GtkCTreeNode *node);
  
! void cleanup_browse_mode(struct tab *tab);
  struct tab *new_browsemode();
  
! void refresh_subtree(int error_context, 
! 		     GtkCTree *ctree, 
  		     GtkCTreeNode *node);
  
! void refresh_subtree_new_dn(int error_context, 
! 			    GtkCTree *ctree, 
  			    GtkCTreeNode *node,
  			    const char *newdn,
  			    int options);
  
! void refresh_subtree_with_options(int error_context, 
  				  GtkCTree *ctree,
  				  GtkCTreeNode *node,
  				  int options);
  
- void refresh_server(GtkCTree *ctree, 
- 		    GtkCTreeNode *node);
- 
  GtkCTreeNode *show_server_dn(int error_context,
! 			     GtkCTree *tree, 
  			     struct ldapserver *server, const char *dn,
  			     gboolean select_node);
--- 128,154 ----
  
  /* get the server object for the current entry */
! struct ldapserver *server_from_node(GtkCTree *ctreeroot,
  				    GtkCTreeNode *node);
  
! /* void cleanup_browse_mode(struct tab *tab); */
  struct tab *new_browsemode();
  
! void refresh_subtree(int error_context,
! 		     GtkCTree *ctree,
  		     GtkCTreeNode *node);
  
! void refresh_subtree_new_dn(int error_context,
! 			    GtkCTree *ctree,
  			    GtkCTreeNode *node,
  			    const char *newdn,
  			    int options);
  
! void refresh_subtree_with_options(int error_context,
  				  GtkCTree *ctree,
  				  GtkCTreeNode *node,
  				  int options);
  
  GtkCTreeNode *show_server_dn(int error_context,
! 			     GtkCTree *tree,
  			     struct ldapserver *server, const char *dn,
  			     gboolean select_node);
***************
*** 164,174 ****
  		      gboolean select_node);
  
! GtkCTreeNode *node_from_dn(GtkCTree *ctreeroot, 
  			   GtkCTreeNode *top,
  			   char *dn);
  
! void add_single_server(struct tab *tab, struct ldapserver *server);
! void tree_row_expanded(GtkCTree *ctree, GtkCTreeNode *ctree_node, struct tab *tab);
! void tree_row_selected(GtkCTree *ctree, GtkCTreeNode *node, int column, struct tab *tab);
  
  GtkCTreeNode *dn_browse_single_add(const char *dn,
--- 157,165 ----
  		      gboolean select_node);
  
! GtkCTreeNode *node_from_dn(GtkCTree *ctreeroot,
  			   GtkCTreeNode *top,
  			   char *dn);
  
! /* void add_single_server(struct tab *tab, struct ldapserver *server); */
  
  GtkCTreeNode *dn_browse_single_add(const char *dn,
***************
*** 176,179 ****
--- 167,171 ----
  				   GtkCTreeNode *node);
  
+ 
  /* options to the refresh_subtree_with_options functions */
  /* NOTE: browse-dnd.h defines additional options starting at 256 */
***************
*** 181,185 ****
  #define REFRESH_FORCE_UNEXPAND	2
  
! GtkCTreeNode *tree_node_from_server_dn(GtkCTree *ctree, 
  				       struct ldapserver *server,
  				       const char *dn);
--- 173,177 ----
  #define REFRESH_FORCE_UNEXPAND	2
  
! GtkCTreeNode *tree_node_from_server_dn(GtkCTree *ctree,
  				       struct ldapserver *server,
  				       const char *dn);

Index: configfile.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/configfile.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** configfile.c	2 Nov 2003 17:41:04 -0000	1.50
--- configfile.c	3 Nov 2003 21:07:57 -0000	1.51
***************
*** 43,46 ****
--- 43,47 ----
  #include "template.h"
  #include "filter.h"
+ #include "encode.h"		/* gq_codeset */
  #include "errorchain.h"
  #include "debug.h"
***************
*** 55,76 ****
  
  const struct tokenlist token_searchargument[] = {
!      { SEARCHARG_BEGINS_WITH, "Begins with" },
!      { SEARCHARG_ENDS_WITH,   "Ends with" },
!      { SEARCHARG_CONTAINS,    "Contains" },
!      { SEARCHARG_EQUALS,      "Equals" },
!      { 0, "" }
  };
  
  const struct tokenlist token_bindtype[] = {
!      { BINDTYPE_SIMPLE,    "Simple" },
!      { BINDTYPE_KERBEROS,  "Kerberos"},
!      { BINDTYPE_SASL,      "SASL"},
!      { 0, "" }
  };
  
  const struct tokenlist token_ldifformat[] = {
!      { LDIF_UMICH,         "UMich" },
!      { LDIF_V1,            "Version1" },
!      { 0, "" }
  };
  
--- 56,77 ----
  
  const struct tokenlist token_searchargument[] = {
!      { SEARCHARG_BEGINS_WITH, "Begins with",	NULL },
!      { SEARCHARG_ENDS_WITH,   "Ends with",	NULL },
!      { SEARCHARG_CONTAINS,    "Contains",	NULL },
!      { SEARCHARG_EQUALS,      "Equals",		NULL },
!      { 0, "",					NULL }
  };
  
  const struct tokenlist token_bindtype[] = {
!      { BINDTYPE_SIMPLE,    "Simple",		NULL },
!      { BINDTYPE_KERBEROS,  "Kerberos",		NULL },
!      { BINDTYPE_SASL,      "SASL",		NULL },
!      { 0, "",					NULL }
  };
  
  const struct tokenlist token_ldifformat[] = {
!      { LDIF_UMICH,         "UMich",		NULL },
!      { LDIF_V1,            "Version1",		NULL },
!      { 0, "",					NULL }
  };
  
***************
*** 107,110 ****
--- 108,112 ----
       newserver->is_uri = 0;
  
+      /* operational */
       newserver->connection = NULL;
       newserver->incarnation = 0;
***************
*** 121,125 ****
  
  /* saves typing */
! #define DEEPCOPY(t,s,n) t->n = s->n ? g_strdup(s->n) : NULL
  #define SHALLOWCOPY(t,s,n) t->n = s->n
  
--- 123,127 ----
  
  /* saves typing */
! #define DEEPCOPY(t,s,n) g_free_and_dup(t->n, s->n)
  #define SHALLOWCOPY(t,s,n) t->n = s->n
  
***************
*** 250,265 ****
  
  
! void config_add_server(struct gq_config *config, 
  		       struct ldapserver *newserver)
  {
!      config->servers = g_list_append(config->servers, newserver);
       ldapserver_ref(newserver);
  }
  
  
! void config_remove_server(struct gq_config *config, 
  			  struct ldapserver *server)
  {
!      config->servers = g_list_remove(config->servers, server);
       ldapserver_unref(server);
  }
--- 252,267 ----
  
  
! void config_add_server(struct gq_config *cfg, 
  		       struct ldapserver *newserver)
  {
!      cfg->servers = g_list_append(cfg->servers, newserver);
       ldapserver_ref(newserver);
  }
  
  
! void config_remove_server(struct gq_config *cfg, 
  			  struct ldapserver *server)
  {
!      cfg->servers = g_list_remove(cfg->servers, server);
       ldapserver_unref(server);
  }
***************
*** 591,595 ****
       { 
  	  char xmldecl[255];
- 	  extern const char *gq_codeset;
  
  	  snprintf(xmldecl, sizeof(xmldecl),
--- 593,596 ----

Index: configfile.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/configfile.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** configfile.h	2 Nov 2003 17:41:04 -0000	1.36
--- configfile.h	3 Nov 2003 21:07:57 -0000	1.37
***************
*** 118,124 ****
  
  struct keywordlist {
!      char attribute[64];
!      int token;
!      int flags;
  };
  
--- 118,124 ----
  
  struct keywordlist {
!      const char attribute[64];
!      const int token;
!      const int flags;
  };
  

Index: debug.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/debug.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** debug.c	17 Oct 2003 06:31:16 -0000	1.9
--- debug.c	3 Nov 2003 21:07:57 -0000	1.10
***************
*** 47,51 ****
  #endif
  
! void *gq_malloc(size_t size, char *msg)
  {
       void *newmem;
--- 47,51 ----
  #endif
  
! void *gq_malloc(size_t size, const char *msg)
  {
       void *newmem;
***************
*** 65,69 ****
  
  
! void gq_free(void *mem, char *msg)
  {
  #ifdef DEBUG
--- 65,69 ----
  
  
! void gq_free(void *mem, const char *msg)
  {
  #ifdef DEBUG

Index: debug.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/debug.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** debug.h	22 Oct 2003 05:39:46 -0000	1.8
--- debug.h	3 Nov 2003 21:07:57 -0000	1.9
***************
*** 68,73 ****
  #endif /* DEBUG */
  
! void *gq_malloc(size_t size, char *msg);
! void gq_free(void *mem, char *msg);
  void report_num_mallocs(void);
  void dump_ldapservers(void);
--- 68,73 ----
  #endif /* DEBUG */
  
! void *gq_malloc(size_t size, const char *msg);
! void gq_free(void *mem, const char *msg);
  void report_num_mallocs(void);
  void dump_ldapservers(void);

Index: dt_binary.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_binary.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** dt_binary.c	2 Nov 2003 07:20:43 -0000	1.16
--- dt_binary.c	3 Nov 2003 21:07:57 -0000	1.17
***************
*** 1,8 ****
  /*
      GQ -- a GTK-based LDAP client
!     Copyright (C) 1998-2001 Bert Vermeulen
! 
!     This file (dt_binary.c) is
!     Copyright (C) 2002 by Peter Stamfest and Bert Vermeulen
  
      This program is released under the Gnu General Public License with
--- 1,6 ----
  /*
      GQ -- a GTK-based LDAP client
!     Copyright (C) 1998-2003 Bert Vermeulen
!     Copyright (C) 2002-2003 Peter Stamfest
  
      This program is released under the Gnu General Public License with
***************
*** 268,272 ****
  	 } else if (*flags & DT_BINARY_PLAIN) {
  	      /* check if data does NOT contain a NUL byte .... */
! 	      int i;
  	      int fail = 0;
  	      for (i = 0 ; i < data->len ; i++) {
--- 266,270 ----
  	 } else if (*flags & DT_BINARY_PLAIN) {
  	      /* check if data does NOT contain a NUL byte .... */
! 	      unsigned int i;
  	      int fail = 0;
  	      for (i = 0 ; i < data->len ; i++) {

Index: dt_generic_binary.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_generic_binary.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** dt_generic_binary.c	2 Nov 2003 17:23:49 -0000	1.13
--- dt_generic_binary.c	3 Nov 2003 21:07:57 -0000	1.14
***************
*** 351,355 ****
  	  file = open(selected_filename, O_WRONLY | O_TRUNC | O_CREAT, 0666);
  	  if (file >= 0) {
! 	       int n, wrote = 0;
  
  	       while( (n = write(file, data->data + wrote,
--- 351,356 ----
  	  file = open(selected_filename, O_WRONLY | O_TRUNC | O_CREAT, 0666);
  	  if (file >= 0) {
! 	       int n;
! 	       unsigned int wrote = 0;
  
  	       while( (n = write(file, data->data + wrote,

Index: dt_oc.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_oc.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** dt_oc.c	2 Nov 2003 07:20:43 -0000	1.20
--- dt_oc.c	3 Nov 2003 21:07:57 -0000	1.21
***************
*** 351,355 ****
  	  oc = find_oc_by_oc_name(ss, newtext);
  	  if (oc) {
! 	       LDAPAttributeType *at;
  	       /* required attributes */
  	       for(i = 0; oc->oc_at_oids_must && oc->oc_at_oids_must[i]; i++) {
--- 351,356 ----
  	  oc = find_oc_by_oc_name(ss, newtext);
  	  if (oc) {
! 	       at = NULL;
! 
  	       /* required attributes */
  	       for(i = 0; oc->oc_at_oids_must && oc->oc_at_oids_must[i]; i++) {

Index: dt_password.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_password.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** dt_password.c	2 Nov 2003 07:20:43 -0000	1.21
--- dt_password.c	3 Nov 2003 21:07:57 -0000	1.22
***************
*** 69,81 ****
  /* NOTE: The password-hash generating functions may change the data
     in-place. They are explicitly permitted to do so. */
! static GByteArray *dt_password_encode_password_crypt(char *data, int len);
! static GByteArray *dt_password_encode_password_md5(char *data, int len);
! static GByteArray *dt_password_encode_password_sha1(char *data, int len);
! static GByteArray *dt_password_encode_password_ssha1(char *data, int len);
! static GByteArray *dt_password_encode_password_smd5(char *data, int len);
! static GByteArray *dt_password_encode_password_nthash(char *data, int len);
! static GByteArray *dt_password_encode_password_lmhash(char *data, int len);
  
! typedef GByteArray *(CryptFunc)(char *data, int len);
  #endif
  
--- 69,88 ----
  /* NOTE: The password-hash generating functions may change the data
     in-place. They are explicitly permitted to do so. */
! static GByteArray *dt_password_encode_password_crypt(char *data, 
! 						     unsigned int len);
! static GByteArray *dt_password_encode_password_md5(char *data,
! 						   unsigned int len);
! static GByteArray *dt_password_encode_password_sha1(char *data,
! 						    unsigned int len);
! static GByteArray *dt_password_encode_password_ssha1(char *data,
! 						     unsigned int len);
! static GByteArray *dt_password_encode_password_smd5(char *data,
! 						    unsigned int len);
! static GByteArray *dt_password_encode_password_nthash(char *data,
! 						      unsigned int len);
! static GByteArray *dt_password_encode_password_lmhash(char *data,
! 						      unsigned int len);
  
! typedef GByteArray *(CryptFunc)(char *data, unsigned int len);
  #endif
  
***************
*** 126,130 ****
  #if defined(HAVE_LIBCRYPTO)
  
! static GByteArray *dt_password_encode_password_crypt(char *data, int len)
  {
       GString *salt;
--- 133,138 ----
  #if defined(HAVE_LIBCRYPTO)
  
! static GByteArray *dt_password_encode_password_crypt(char *data, 
! 						     unsigned int len)
  {
       GString *salt;
***************
*** 155,159 ****
  }
  
! static GByteArray *dt_password_encode_password_md5(char *data, int len)
  {
       char md5_out[MD5_DIGEST_LENGTH];
--- 163,168 ----
  }
  
! static GByteArray *dt_password_encode_password_md5(char *data, 
! 						   unsigned int len)
  {
       char md5_out[MD5_DIGEST_LENGTH];
***************
*** 173,177 ****
  }
  
! static GByteArray *dt_password_encode_password_sha1(char *data, int len)
  {
       char sha_out[SHA_DIGEST_LENGTH];
--- 182,187 ----
  }
  
! static GByteArray *dt_password_encode_password_sha1(char *data, 
! 						    unsigned int len)
  {
       char sha_out[SHA_DIGEST_LENGTH];
***************
*** 192,196 ****
  
  
! static GByteArray *dt_password_encode_password_ssha1(char *data, int len)
  {
       unsigned char rand[4];
--- 202,207 ----
  
  
! static GByteArray *dt_password_encode_password_ssha1(char *data, 
! 						     unsigned int len)
  {
       unsigned char rand[4];
***************
*** 219,223 ****
  }
  
! static GByteArray *dt_password_encode_password_smd5(char *data, int len)
  {
       unsigned char rand[4];
--- 230,235 ----
  }
  
! static GByteArray *dt_password_encode_password_smd5(char *data,
! 						    unsigned int len)
  {
       unsigned char rand[4];
***************
*** 247,254 ****
  
  static const char hexdigit[] = "0123456789ABCDEF";
! static GByteArray *dt_password_encode_password_nthash(char *data, int len)
  {
       unsigned char md4_out[MD4_DIGEST_LENGTH];
!      int i;
       GByteArray *unicode = g_byte_array_new();
       GByteArray *gb = g_byte_array_new();
--- 259,267 ----
  
  static const char hexdigit[] = "0123456789ABCDEF";
! static GByteArray *dt_password_encode_password_nthash(char *data, 
! 						      unsigned int len)
  {
       unsigned char md4_out[MD4_DIGEST_LENGTH];
!      unsigned int i;
       GByteArray *unicode = g_byte_array_new();
       GByteArray *gb = g_byte_array_new();
***************
*** 315,319 ****
     handled by toupper) */
  
! static des_cblock *lm_make_key(const char *pw, des_cblock *key)
  {
       int i;
--- 328,332 ----
     handled by toupper) */
  
! static void lm_make_key(const char *pw, des_cblock *key)
  {
       int i;
***************
*** 330,336 ****
  
  static const char *lmhash_key = "KGS!@#$%";
! static GByteArray *dt_password_encode_password_lmhash(char *data, int len)
  {
!      int i;
       char hex[2];
       char plain[15];
--- 343,350 ----
  
  static const char *lmhash_key = "KGS!@#$%";
! static GByteArray *dt_password_encode_password_lmhash(char *data, 
! 						      unsigned int len)
  {
!      unsigned int i;
       char hex[2];
       char plain[15];

Index: dt_time.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_time.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** dt_time.c	2 Nov 2003 07:20:43 -0000	1.11
--- dt_time.c	3 Nov 2003 21:07:57 -0000	1.12
***************
*** 93,97 ****
       
       struct {
! 	  char *fmt;
  	  int *ptr;
  	  int max;
--- 93,97 ----
       
       struct {
! 	  const char *fmt;
  	  int *ptr;
  	  int max;
***************
*** 103,107 ****
  	  { "%2u", &tm->tm_min, 59 },
  	  { "%2u", &tm->tm_sec, 59 },
! 	  { NULL, NULL },
       };
  
--- 103,107 ----
  	  { "%2u", &tm->tm_min, 59 },
  	  { "%2u", &tm->tm_sec, 59 },
! 	  { NULL, NULL, 0 },
       };
  

Index: dtutil.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dtutil.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dtutil.c	30 Sep 2003 17:20:25 -0000	1.4
--- dtutil.c	3 Nov 2003 21:07:57 -0000	1.5
***************
*** 1,8 ****
  /*
      GQ -- a GTK-based LDAP client
!     Copyright (C) 1998-2001 Bert Vermeulen
! 
!     This file (dtutil.c) is
!     Copyright (C) 2002 by Peter Stamfest
  
      This program is released under the Gnu General Public License with
--- 1,6 ----
  /*
      GQ -- a GTK-based LDAP client
!     Copyright (C) 1998-2003 Bert Vermeulen
!     Copyright (C) 2002-2003 Peter Stamfest
  
      This program is released under the Gnu General Public License with

Index: filter.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/filter.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** filter.c	2 Nov 2003 17:49:46 -0000	1.26
--- filter.c	3 Nov 2003 21:07:57 -0000	1.27
***************
*** 53,56 ****
--- 53,72 ----
  
  static void copy_existing_filter(GtkCList *filter_clist);
+ static void name_popup(void);
+ static void filterlist_row_selected(GtkCList *filter_clist,
+ 				    int row, int column,
+ 				    GdkEventButton *event, gpointer data);
+ static void filterlist_row_unselected(GtkCList *filter_clist,
+ 				      int row, int column,
+ 				      GdkEventButton *event, gpointer data);
+ static void remove_from_filtermenu(struct gq_filter *filter);
+ static void delete_filter(GtkWidget *widget, GtkCList *filter_clist);
+ static void edit_filter(GtkCList *filter_clist, int is_new_filter, 
+ 			int row, struct gq_filter *filter);
+ 
+ static void save_filter(GtkWidget *window);
+ static char *indent_filter(char *filter);
+ static char *unindent_filter(char *indented);
+ static void indent_toggled(GtkToggleButton *indent, gpointer editbox);
  
  struct gq_filter *new_filter()
***************
*** 87,91 ****
  }
  
! struct gq_filter *check_filtername(const char *filtername)
  {
       GList *filterlist;
--- 103,107 ----
  }
  
! static struct gq_filter *check_filtername(const char *filtername)
  {
       GList *filterlist;
***************
*** 206,210 ****
  
  
! void name_popup(void)
  {
       GtkWidget *window, *vbox1, *vbox2, *hbox0, *label, *filternamebox, *button;
--- 222,226 ----
  
  
! static void name_popup(void)
  {
       GtkWidget *window, *vbox1, *vbox2, *hbox0, *label, *filternamebox, *button;
***************
*** 476,481 ****
  
  
! void filterlist_row_selected(GtkCList *filter_clist, int row, int column,
! 			     GdkEventButton *event, gpointer data)
  {
       struct gq_filter *filter;
--- 492,498 ----
  
  
! static void filterlist_row_selected(GtkCList *filter_clist,
! 				    int row, int column,
! 				    GdkEventButton *event, gpointer data)
  {
       struct gq_filter *filter;
***************
*** 500,505 ****
  
  
! void filterlist_row_unselected(GtkCList *filter_clist, int row, int column,
! 			       GdkEventButton *event, gpointer data)
  {
  
--- 517,523 ----
  
  
! static void filterlist_row_unselected(GtkCList *filter_clist,
! 				      int row, int column,
! 				      GdkEventButton *event, gpointer data)
  {
  
***************
*** 517,526 ****
  
  
! void delete_filter(GtkWidget *widget, GtkCList *filter_clist)
  {
       int selected_row;
       struct gq_filter *filter;
  
!      selected_row = (GPOINTER_TO_UINT(gtk_object_get_data(GTK_OBJECT(filter_clist), "selected_row")));
       if(selected_row == -1)
  	  /* nothing selected */
--- 535,544 ----
  
  
! static void delete_filter(GtkWidget *widget, GtkCList *filter_clist)
  {
       int selected_row;
       struct gq_filter *filter;
  
!      selected_row = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(filter_clist), "selected_row"));
       if(selected_row == -1)
  	  /* nothing selected */
***************
*** 552,556 ****
       struct gq_filter *filter;
  
!      selected_row = (GPOINTER_TO_UINT(gtk_object_get_data(GTK_OBJECT(filter_clist), "selected_row")));
       if(selected_row == -1)
  	  /* nothing selected */
--- 570,574 ----
       struct gq_filter *filter;
  
!      selected_row = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(filter_clist), "selected_row"));
       if(selected_row == -1)
  	  /* nothing selected */
***************
*** 564,568 ****
  
  
! void remove_from_filtermenu(struct gq_filter *filter)
  {
       GtkWidget *menuitem;
--- 582,586 ----
  
  
! static void remove_from_filtermenu(struct gq_filter *filter)
  {
       GtkWidget *menuitem;
***************
*** 586,591 ****
  
  
! void edit_filter(GtkCList *filter_clist, int is_new_filter, 
! 		 int row, struct gq_filter *filter)
  {
  #if GTK_MAJOR >= 2
--- 604,609 ----
  
  
! static void edit_filter(GtkCList *filter_clist, int is_new_filter, 
! 			int row, struct gq_filter *filter)
  {
  #if GTK_MAJOR >= 2
***************
*** 794,798 ****
  
  
! void save_filter(GtkWidget *window)
  {
       GtkWidget *entry, *text, *filter_clist;
--- 812,816 ----
  
  
! static void save_filter(GtkWidget *window)
  {
       GtkWidget *entry, *text, *filter_clist;
***************
*** 978,982 ****
  
  
! char *indent_filter(char *filter)
  {
       unsigned int i, f, s, indent, oslstack[30];
--- 996,1000 ----
  
  
! static char *indent_filter(char *filter)
  {
       unsigned int i, f, s, indent, oslstack[30];
***************
*** 1045,1049 ****
  
  
! char *unindent_filter(char *indented)
  {
       unsigned int s, f, allow_sp, allow_sp_next;
--- 1063,1067 ----
  
  
! static char *unindent_filter(char *indented)
  {
       unsigned int s, f, allow_sp, allow_sp_next;
***************
*** 1091,1095 ****
  
  
! void indent_toggled(GtkToggleButton *indent, gpointer editbox)
  {
       char *current, *newtext;
--- 1109,1113 ----
  
  
! static void indent_toggled(GtkToggleButton *indent, gpointer editbox)
  {
       char *current, *newtext;

Index: filter.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/filter.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** filter.h	2 Nov 2003 07:20:44 -0000	1.5
--- filter.h	3 Nov 2003 21:07:57 -0000	1.6
***************
*** 47,67 ****
  void copy_filter(struct gq_filter *target, const struct gq_filter *source);
  
! struct gq_filter *check_filtername(const char *filtername);
  void add_filter(GtkWidget *filternamebox);
! void name_popup(void);
  void filter_selected(struct gq_filter *filter);
  void show_filters(void);
! void filterlist_row_selected(GtkCList *filter_clist, int row, int column,
! 				  GdkEventButton *event, gpointer data);
! void filterlist_row_unselected(GtkCList *filter_clist, int row, int column,
! 			       GdkEventButton *event, gpointer data);
  void add_new_filter_callback(GtkCList *filter_clist);
! void delete_filter(GtkWidget *widget, GtkCList *filter_clist);
! void remove_from_filtermenu(struct gq_filter *filter);
! void edit_filter(GtkCList *filter_clist, int is_new_filter, int row, struct gq_filter *filter);
! void save_filter(GtkWidget *window);
! char *indent_filter(char *filter);
! char *unindent_filter(char *indented);
! void indent_toggled(GtkToggleButton *indent, gpointer editbox);
  
  #endif /* GQ_FILTER_H_INCLUDED */
--- 47,68 ----
  void copy_filter(struct gq_filter *target, const struct gq_filter *source);
  
! /* struct gq_filter *check_filtername(const char *filtername); */
  void add_filter(GtkWidget *filternamebox);
! /* void name_popup(void); */
  void filter_selected(struct gq_filter *filter);
  void show_filters(void);
! /* void filterlist_row_selected(GtkCList *filter_clist, int row, int column, */
! /* 				  GdkEventButton *event, gpointer data); */
! /* void filterlist_row_unselected(GtkCList *filter_clist, int row, int column, */
! /* 			       GdkEventButton *event, gpointer data); */
  void add_new_filter_callback(GtkCList *filter_clist);
! /* void delete_filter(GtkWidget *widget, GtkCList *filter_clist); */
! /* void remove_from_filtermenu(struct gq_filter *filter); */
! /* void edit_filter(GtkCList *filter_clist, int is_new_filter, int row, struct gq_filter *filter); */
! /* void save_filter(GtkWidget *window); */
! /* char *indent_filter(char *filter); */
! /* char *unindent_filter(char *indented); */
! /* void indent_toggled(GtkToggleButton *indent, gpointer editbox); */
! 
  
  #endif /* GQ_FILTER_H_INCLUDED */

Index: formfill.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/formfill.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** formfill.c	2 Nov 2003 17:41:05 -0000	1.44
--- formfill.c	3 Nov 2003 21:07:57 -0000	1.45
***************
*** 218,222 ****
  	  entry = ldap_first_entry(ld, res);
  	  if(entry) {
! 	       char *c;
  	       
  	       for(attr = ldap_first_attribute(ld, entry, &ber); attr ;
--- 218,222 ----
  	  entry = ldap_first_entry(ld, res);
  	  if(entry) {
! 	       char *cc;
  	       
  	       for(attr = ldap_first_attribute(ld, entry, &ber); attr ;
***************
*** 224,232 ****
  		    gboolean oc;
  		    /* filter out some internal attributes... */
! 		    c = attr_strip(attr);
  		    if (server->hide_internal) {
! 			 if (isInternalAttr(c)) {
  			      ldap_memfree(attr);
! 			      if (c) g_free(c);
  			      continue;
  			 }
--- 224,232 ----
  		    gboolean oc;
  		    /* filter out some internal attributes... */
! 		    cc = attr_strip(attr);
  		    if (server->hide_internal) {
! 			 if (isInternalAttr(cc)) {
  			      ldap_memfree(attr);
! 			      if (cc) g_free(cc);
  			      continue;
  			 }
***************
*** 239,244 ****
  		    ldapserver_ref(server);
  		    
! 		    strncpy(form->attrname, c, MAX_ATTR_LEN);
! 		    if (c) g_free(c);
  		    
  		    oc  = strcasecmp(attr, "objectClass") == 0;
--- 239,244 ----
  		    ldapserver_ref(server);
  		    
! 		    strncpy(form->attrname, cc, MAX_ATTR_LEN);
! 		    if (cc) g_free(cc);
  		    
  		    oc  = strcasecmp(attr, "objectClass") == 0;
***************
*** 426,430 ****
     check for aliases. The canonical attribute type may be retrieved
     when passing a non NULL value for attrtype */
! struct formfill *lookup_attribute_using_schema(GList *formlist, char *attr,
  					       struct server_schema *schema,
  					       LDAPAttributeType **attrtype)
--- 426,431 ----
     check for aliases. The canonical attribute type may be retrieved
     when passing a non NULL value for attrtype */
! struct formfill *lookup_attribute_using_schema(GList *formlist, 
! 					       const char *attr,
  					       struct server_schema *schema,
  					       LDAPAttributeType **attrtype)

Index: formfill.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/formfill.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** formfill.h	2 Nov 2003 07:20:44 -0000	1.29
--- formfill.h	3 Nov 2003 21:07:57 -0000	1.30
***************
*** 118,122 ****
  void dump_formlist(GList *formlist);
  struct formfill *lookup_attribute(GList *formlist, char *attr);
! struct formfill *lookup_attribute_using_schema(GList *formlist, char *attr,
  					       struct server_schema *schema,
  					       LDAPAttributeType **attrtype);
--- 118,123 ----
  void dump_formlist(GList *formlist);
  struct formfill *lookup_attribute(GList *formlist, char *attr);
! struct formfill *lookup_attribute_using_schema(GList *formlist, 
! 					       const char *attr,
  					       struct server_schema *schema,
  					       LDAPAttributeType **attrtype);

Index: gq-xml.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/gq-xml.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gq-xml.c	2 Nov 2003 17:41:05 -0000	1.11
--- gq-xml.c	3 Nov 2003 21:07:57 -0000	1.12
***************
*** 37,40 ****
--- 37,41 ----
  #include <errno.h>
  #include <fcntl.h>
+ #include <ctype.h>
  
  #include "gq-xml.h"
***************
*** 50,53 ****
--- 51,55 ----
  #include "errorchain.h"
  #include "common.h"
+ #include "encode.h"		/* gq_codeset */
  
  
***************
*** 973,977 ****
  
      {
! 	NULL
      },
  
--- 975,981 ----
  
      {
! 	NULL, 0,
! 	NULL, NULL,
! 	{ NULL },
      },
  
***************
*** 982,986 ****
  {
      FILE *fp = fopen(filename, "r");
-     extern int errno;
      int changed = 0;
  
--- 986,989 ----
***************
*** 1011,1015 ****
  	    return 0;
  	} else {
- 	    extern const char *gq_codeset;
  	    char *cfgbuf;
  	    GString *newbuf;
--- 1014,1017 ----

Index: input.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/input.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** input.c	2 Nov 2003 17:41:05 -0000	1.81
--- input.c	3 Nov 2003 21:07:57 -0000	1.82
***************
*** 1758,1768 ****
       mods = formdiff_to_ldapmod(oldlist, newlist);
       if(mods != NULL && mods[0] != NULL) {
! 	  LDAPControl c, *ctrls[2] = { NULL, NULL } ;
! 	  c.ldctl_oid		= LDAP_CONTROL_MANAGEDSAIT;
! 	  c.ldctl_value.bv_val	= NULL;
! 	  c.ldctl_value.bv_len	= 0;
! 	  c.ldctl_iscritical	= 1;
  	  
! 	  ctrls[0] = &c;
  
  /*   dump_mods(mods); */
--- 1758,1768 ----
       mods = formdiff_to_ldapmod(oldlist, newlist);
       if(mods != NULL && mods[0] != NULL) {
! 	  LDAPControl ct, *ctrls[2] = { NULL, NULL } ;
! 	  ct.ldctl_oid		= LDAP_CONTROL_MANAGEDSAIT;
! 	  ct.ldctl_value.bv_val	= NULL;
! 	  ct.ldctl_value.bv_len	= 0;
! 	  ct.ldctl_iscritical	= 1;
  	  
! 	  ctrls[0] = &ct;
  
  /*   dump_mods(mods); */
***************
*** 2465,2469 ****
       struct server_schema *ss;
  
!      attr_dialog_comm comm = { 0, 0, 0, NULL };
       comm.outbuf = outbuf;
       *outbuf = NULL;
--- 2465,2469 ----
       struct server_schema *ss;
  
!      attr_dialog_comm comm = { 0, 0, 0, NULL, NULL, NULL };
       comm.outbuf = outbuf;
       *outbuf = NULL;

Index: ldapops.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/ldapops.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ldapops.c	2 Nov 2003 07:20:44 -0000	1.21
--- ldapops.c	3 Nov 2003 21:07:57 -0000	1.22
***************
*** 165,169 ****
       c.ldctl_value.bv_val	= NULL;
       c.ldctl_value.bv_len	= 0;
!      c.ldctl_iscritical	= 1;
       
       ctrls[0] = &c;
--- 165,169 ----
       c.ldctl_value.bv_val	= NULL;
       c.ldctl_value.bv_len	= 0;
!      c.ldctl_iscritical		= 1;
       
       ctrls[0] = &c;
***************
*** 182,195 ****
       if (sld == tld && (flags & MOVE_DELETE_MOVED) && 
  	 source_server->version == LDAP_VERSION3) {
- 	  LDAPControl cc, *ctrls[2] = { NULL, NULL } ;
- 	  
- 	  /* prepare ManageDSAit in case we deal with referrals */
- 	  cc.ldctl_oid		= LDAP_CONTROL_MANAGEDSAIT;
- 	  cc.ldctl_value.bv_val	= NULL;
- 	  cc.ldctl_value.bv_len	= 0;
- 	  cc.ldctl_iscritical	= 1;
- 	  
- 	  ctrls[0] = &cc;
- 
  	  rc = ldap_rename_s(sld,
  			     source_dn,		/* dn */
--- 182,185 ----
***************
*** 303,307 ****
                    entries ... and copying may continue */
  	       do {
! 		    LDAPMessage *res;
  
  		    recheck = FALSE;
--- 293,297 ----
                    entries ... and copying may continue */
  	       do {
! 		    res = NULL;
  
  		    recheck = FALSE;

Index: mainwin.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/mainwin.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** mainwin.c	2 Nov 2003 17:41:05 -0000	1.54
--- mainwin.c	3 Nov 2003 21:07:57 -0000	1.55
***************
*** 58,61 ****
--- 58,63 ----
  struct mainwin_data mainwin;
  
+ static void create_license_window(void);
+ static GtkWidget *create_about_window(void);
  
  static void close_current_tab(struct mainwin_data *win);
***************
*** 925,929 ****
  }
  
! void create_license_window(void)
  {
  #if GTK_MAJOR < 2
--- 927,931 ----
  }
  
! static void create_license_window(void)
  {
  #if GTK_MAJOR < 2
***************
*** 1040,1044 ****
  }
  
! GtkWidget *create_about_window(void)
  {
       GtkWidget *dialog_vbox2, *hbox0, *hbox;
--- 1042,1046 ----
  }
  
! static GtkWidget *create_about_window(void)
  {
       GtkWidget *dialog_vbox2, *hbox0, *hbox;

Index: mainwin.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/mainwin.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** mainwin.h	2 Nov 2003 17:41:05 -0000	1.24
--- mainwin.h	3 Nov 2003 21:07:57 -0000	1.25
***************
*** 96,101 ****
  void cleanup_tab(struct tab *tab);
  void update_serverlist(struct mainwin_data *win);
! void create_license_window(void);
! GtkWidget *create_about_window(void);
  /* gboolean ctrl_b_hack(GtkWidget *widget, GdkEventKey *event, gpointer obj); */
  /* gboolean ctrl_w_hack(GtkWidget *widget, GdkEventKey *event, gpointer obj); */
--- 96,100 ----
  void cleanup_tab(struct tab *tab);
  void update_serverlist(struct mainwin_data *win);
! 
  /* gboolean ctrl_b_hack(GtkWidget *widget, GdkEventKey *event, gpointer obj); */
  /* gboolean ctrl_w_hack(GtkWidget *widget, GdkEventKey *event, gpointer obj); */

Index: prefs.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/prefs.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** prefs.c	2 Nov 2003 17:23:49 -0000	1.54
--- prefs.c	3 Nov 2003 21:07:57 -0000	1.55
***************
*** 1199,1205 ****
  
  static void prefs_okbutton_callback(GtkWidget *button,
! 				          struct prefs_windata *pw)
  {
!      int type;
  
       /* Search type */
--- 1199,1205 ----
  
  static void prefs_okbutton_callback(GtkWidget *button,
! 				    struct prefs_windata *pw)
  {
!      unsigned int type;
  
       /* Search type */

Index: ref-browse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/ref-browse.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ref-browse.c	2 Nov 2003 17:23:49 -0000	1.9
--- ref-browse.c	3 Nov 2003 21:07:57 -0000	1.10
***************
*** 138,142 ****
  }
  
! static void ref_browse_entry_expand(browse_entry *e,
  				    int error_context,
  				    GtkCTree *ctree,
--- 138,142 ----
  }
  
! static void ref_browse_entry_expand(browse_entry *be,
  				    int error_context,
  				    GtkCTree *ctree,
***************
*** 145,150 ****
  {
       ref_browse_entry *entry;
!      assert(IS_REF_ENTRY(e));
!      entry = REF_BROWSE_ENTRY(e);
  
       if (!entry->expanded) {
--- 145,150 ----
  {
       ref_browse_entry *entry;
!      assert(IS_REF_ENTRY(be));
!      entry = REF_BROWSE_ENTRY(be);
  
       if (!entry->expanded) {

Index: schema.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/schema.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** schema.c	2 Nov 2003 07:20:44 -0000	1.26
--- schema.c	3 Nov 2003 21:07:58 -0000	1.27
***************
*** 89,95 ****
  			     server->name);
  	  }
-      done:
       }
! 
       set_normalcursor();
       return(ss);
--- 89,94 ----
  			     server->name);
  	  }
       }
!  done:
       set_normalcursor();
       return(ss);
***************
*** 112,122 ****
       const char *errp;
       char *subschema = NULL;
!      char *subschemasubentry[] = { "subschemaSubentry",
! 			       NULL };
!      char *schema_attrs[] = { "objectClasses",
! 			      "attributeTypes",
! 			      "matchingRules",
! 			      "ldapSyntaxes",
! 			      NULL };
  
       if(server->flags & SERVER_HAS_NO_SCHEMA)
--- 111,121 ----
       const char *errp;
       char *subschema = NULL;
!      const char *subschemasubentry[] = { "subschemaSubentry",
! 					 NULL };
!      const char *schema_attrs[] = { "objectClasses",
! 				    "attributeTypes",
! 				    "matchingRules",
! 				    "ldapSyntaxes",
! 				    NULL };
  
       if(server->flags & SERVER_HAS_NO_SCHEMA)
***************
*** 132,136 ****
  		   server->name);
       msg = ldap_search_ext_s(ld, "", LDAP_SCOPE_BASE, "(objectclass=*)",
! 			     subschemasubentry, 0, 
  			     NULL, NULL, NULL, LDAP_NO_LIMIT,
  			     &res);
--- 131,135 ----
  		   server->name);
       msg = ldap_search_ext_s(ld, "", LDAP_SCOPE_BASE, "(objectclass=*)",
! 			     (char**) subschemasubentry, 0, 
  			     NULL, NULL, NULL, LDAP_NO_LIMIT,
  			     &res);
***************
*** 178,182 ****
  
       msg = ldap_search_ext_s(ld, subschema, LDAP_SCOPE_BASE,
! 			     "(objectclass=*)", schema_attrs, 0, 
  			     NULL, NULL, NULL, LDAP_NO_LIMIT,
  			     &res);
--- 177,181 ----
  
       msg = ldap_search_ext_s(ld, subschema, LDAP_SCOPE_BASE,
! 			     "(objectclass=*)", (char**) schema_attrs, 0, 
  			     NULL, NULL, NULL, LDAP_NO_LIMIT,
  			     &res);

Index: schemabrowse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/schemabrowse.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** schemabrowse.c	2 Nov 2003 07:20:44 -0000	1.27
--- schemabrowse.c	3 Nov 2003 21:07:58 -0000	1.28
***************
*** 52,56 ****
  
  
! static void attach_schema_item(GtkWidget *tree, char *type,
  			       void *schemaobject, char *itemname);
  static gboolean schema_button_tree(GtkWidget *tree_item, GdkEventButton *event,
--- 52,56 ----
  
  
! static void attach_schema_item(GtkWidget *tree, const char *type,
  			       void *schemaobject, char *itemname);
  static gboolean schema_button_tree(GtkWidget *tree_item, GdkEventButton *event,
***************
*** 392,396 ****
  
  /* more of a macro really, this makes inserting duplicates easier */
! static void attach_schema_item(GtkWidget *tree, char *type, 
  			       void *schemaobject, char *itemname)
  {
--- 392,396 ----
  
  /* more of a macro really, this makes inserting duplicates easier */
! static void attach_schema_item(GtkWidget *tree, const char *type, 
  			       void *schemaobject, char *itemname)
  {
***************
*** 869,873 ****
       GtkWidget *entry, *combo, *check, *clist;
       int i;
!      char *kind, *dummy[2];
  
       /* left half */
--- 869,874 ----
       GtkWidget *entry, *combo, *check, *clist;
       int i;
!      const char *kind;
!      char *dummy[2];
  
       /* left half */
***************
*** 1262,1266 ****
       GtkWidget *combo, *entry, *check, *clist;
       int i;
!      char *usage, *dummy[2];
  
       /* left half */
--- 1263,1268 ----
       GtkWidget *combo, *entry, *check, *clist;
       int i;
!      const char *usage;
!      char *dummy[2];
  
       /* left half */

Index: search.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/search.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** search.c	2 Nov 2003 17:23:49 -0000	1.61
--- search.c	3 Nov 2003 21:07:58 -0000	1.62
***************
*** 60,66 ****
  static void query(struct tab *tab);
  
! static int column_by_attr(struct attrs **attrlist, char *attribute);
! static int new_attr(struct attrs **attrlist, char *attr);
! static struct attrs *find_attr(struct attrs *attrlist, char *attr);
  
  static gint searchbase_button_clicked(GtkWidget *widget,
--- 60,66 ----
  static void query(struct tab *tab);
  
! static int column_by_attr(struct attrs **attrlist, const char *attribute);
! static int new_attr(struct attrs **attrlist, const char *attr);
! static struct attrs *find_attr(struct attrs *attrlist, const char *attr);
  
  static gint searchbase_button_clicked(GtkWidget *widget,
***************
*** 74,77 ****
--- 74,83 ----
  static void destroy_search_mode(GtkWidget *w, struct tab *tab);
  
+ static void servername_changed_callback(struct tab *tab);
+ static int select_entry_callback(GtkWidget *clist, gint row, gint column,
+ 				 GdkEventButton *event, struct tab *tab);
+ static void search_edit_entry_callback(struct tab *tab);
+ static void search_new_from_entry_callback(GtkWidget *w, struct tab *tab);
+ static void delete_search_entry(struct tab *tab);
  
  static void search_save_snapshot(int error_context, 
***************
*** 882,886 ****
  
  
! void servername_changed_callback(struct tab *tab)
  {
       GList *searchbase_list;
--- 888,892 ----
  
  
! static void servername_changed_callback(struct tab *tab)
  {
       GList *searchbase_list;
***************
*** 981,985 ****
  }
  
! static int column_by_attr(struct attrs **attrlist, char *attribute)
  {
       struct attrs *attr;
--- 987,991 ----
  }
  
! static int column_by_attr(struct attrs **attrlist, const char *attribute)
  {
       struct attrs *attr;
***************
*** 994,1005 ****
  
  
! static int new_attr(struct attrs **attrlist, char *attr)
  {
!      struct attrs *new_attr, *alist;
       int cnt;
  
!      new_attr = g_malloc(sizeof(struct attrs));
!      strncpy(new_attr->name, attr, MAX_ATTR_LEN);
!      new_attr->next = NULL;
  
       cnt = 0;
--- 1000,1011 ----
  
  
! static int new_attr(struct attrs **attrlist, const char *attr)
  {
!      struct attrs *n_attr, *alist;
       int cnt;
  
!      n_attr = g_malloc(sizeof(struct attrs));
!      strncpy(n_attr->name, attr, MAX_ATTR_LEN);
!      n_attr->next = NULL;
  
       cnt = 0;
***************
*** 1011,1020 ****
  	       alist = alist->next;
  	  }
! 	  alist->next = new_attr;
       }
       else
! 	  *attrlist = new_attr;
  
!      new_attr->column = cnt;
  
       return(cnt);
--- 1017,1026 ----
  	       alist = alist->next;
  	  }
! 	  alist->next = n_attr;
       }
       else
! 	  *attrlist = n_attr;
  
!      n_attr->column = cnt;
  
       return(cnt);
***************
*** 1022,1026 ****
  
  
! static struct attrs *find_attr(struct attrs *attrlist, char *attribute)
  {
  
--- 1028,1032 ----
  
  
! static struct attrs *find_attr(struct attrs *attrlist, const char *attribute)
  {
  
***************
*** 1488,1492 ****
  	     list. The attrs[i] MUST NOT be free'd */
  	  const GList *I;
- 	  int i;
  	  
  	  want_oc = 0;
--- 1494,1497 ----
***************
*** 1640,1644 ****
  
  			      if (rc == LDAP_SUCCESS) {
- 				   int i;
  				   for (i = 0 ; refs[i] ; i++) {
  					add_referral(query_context, 
--- 1645,1648 ----
***************
*** 2063,2067 ****
  }
  
! void search_new_from_entry_callback(GtkWidget *w, struct tab *tab)
  {
       struct dn_on_server *set;
--- 2067,2071 ----
  }
  
! static void search_new_from_entry_callback(GtkWidget *w, struct tab *tab)
  {
       struct dn_on_server *set;
***************
*** 2080,2084 ****
  }
  
! void search_edit_entry_callback(struct tab *tab)
  {
       struct dn_on_server *set;
--- 2084,2088 ----
  }
  
! static void search_edit_entry_callback(struct tab *tab)
  {
       struct dn_on_server *set;
***************
*** 2092,2096 ****
  }
  
! void delete_search_entry(struct tab *tab)
  {
       struct dn_on_server *set;
--- 2096,2100 ----
  }
  
! static void delete_search_entry(struct tab *tab)
  {
       struct dn_on_server *set;
***************
*** 2110,2115 ****
  }
  
! int select_entry_callback(GtkWidget *clist, gint row, gint column,
! 			   GdkEventButton *event, struct tab *tab)
  {
       struct dn_on_server *set;
--- 2114,2119 ----
  }
  
! static int select_entry_callback(GtkWidget *clist, gint row, gint column,
! 				 GdkEventButton *event, struct tab *tab)
  {
       struct dn_on_server *set;

Index: search.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/search.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** search.h	2 Nov 2003 07:20:44 -0000	1.17
--- search.h	3 Nov 2003 21:07:58 -0000	1.18
***************
*** 62,78 ****
  
  struct tab *new_searchmode();
- void servername_changed_callback(struct tab *tab);
  
  char *make_filter(struct ldapserver *server, char *querystring);
  
- void search_new_from_entry_callback(GtkWidget *w, struct tab *tab);
- void search_edit_entry_callback(struct tab *tab);
- void delete_search_entry(struct tab *tab);
- int select_entry_callback(GtkWidget *clist, gint row, gint column,
- 			  GdkEventButton *event, struct tab *tab);
- int unselect_entry_callback(GtkWidget *clist, gint row, gint column,
- 			    GdkEventButton *event, struct tab *tab);
- 
- void cleanup_search_mode(struct tab *tab);
  void fill_out_search(struct tab *tab,
  		     struct ldapserver *server,
--- 62,68 ----

Index: state.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/state.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** state.c	2 Nov 2003 17:23:49 -0000	1.11
--- state.c	3 Nov 2003 21:07:58 -0000	1.12
***************
*** 4,10 ****
      Copyright (C) 2002-2003 Peter Stamfest
      
-     This file is
-     Copyright (c) 2003 by Peter Stamfest <pe...@st...>
- 
      This program is released under the Gnu General Public License with
      the additional exemption that compiling, linking, and/or using
--- 4,7 ----
***************
*** 47,50 ****
--- 44,48 ----
  #include "i18n.h"
  #include "state.h"
+ #include "encode.h"		/* gq_codeset */
  
  enum state_value_type {
***************
*** 55,62 ****
  
  static struct tokenlist token_value_type_names[] = {
!     { SV_int,   "integer" },
!     { SV_char,  "string" },
!     { SV_list,	"list" },
!     { 0, "" }
  };
  
--- 53,60 ----
  
  static struct tokenlist token_value_type_names[] = {
!     { SV_int,   "integer",	NULL },
!     { SV_char,  "string",	NULL },
!     { SV_list,	"list",		NULL },
!     { 0, "",			NULL }
  };
  
***************
*** 613,617 ****
      { 
  	char xmldecl[255];
- 	extern const char *gq_codeset;
  	
  	snprintf(xmldecl, sizeof(xmldecl),
--- 611,614 ----
***************
*** 678,682 ****
  		    struct tagstack_entry *e)
  {
!     GHashTable *entities = peek_tag(ctx->stack, 1)->data;
      struct state_entity *ent = e->data;
      int i;
--- 675,679 ----
  		    struct tagstack_entry *e)
  {
!     GHashTable *ents = peek_tag(ctx->stack, 1)->data;
      struct state_entity *ent = e->data;
      int i;
***************
*** 684,688 ****
      for (i = 0 ; e->attrs[i] ; i += 2) {
  	if (strcmp("name", e->attrs[i]) == 0) {
! 	    g_hash_table_insert(entities, g_strdup(e->attrs[i+1]), 
  				ent);
  
--- 681,685 ----
      for (i = 0 ; e->attrs[i] ; i += 2) {
  	if (strcmp("name", e->attrs[i]) == 0) {
! 	    g_hash_table_insert(ents, g_strdup(e->attrs[i+1]), 
  				ent);
  
***************
*** 821,825 ****
      },
      {
! 	NULL
      }
  };
--- 818,824 ----
      },
      {
! 	NULL, 0,
! 	NULL, NULL, 
! 	{ NULL },
      }
  };

Index: syntax.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/syntax.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** syntax.c	2 Nov 2003 17:23:49 -0000	1.20
--- syntax.c	3 Nov 2003 21:07:58 -0000	1.21
***************
*** 538,542 ****
  	 /* lookup syntax... */
  	 for(sh = syntaxes ; sh->syntax_oid ; sh++) {
! 	     g_hash_table_insert(syntax_hash, sh->syntax_oid, sh);
  	 }
       }
--- 538,542 ----
  	 /* lookup syntax... */
  	 for(sh = syntaxes ; sh->syntax_oid ; sh++) {
! 	     g_hash_table_insert(syntax_hash, (gpointer) sh->syntax_oid, sh);
  	 }
       }

Index: syntax.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/syntax.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** syntax.h	2 Nov 2003 07:20:44 -0000	1.10
--- syntax.h	3 Nov 2003 21:07:58 -0000	1.11
***************
*** 34,39 ****
  
  struct syntax_handler {
!      char *syntax_oid;
!      char *desc;
       int displaytype;
       int (*displayTypeFunc)(const char *attr, const char *syn_oid);
--- 34,39 ----
  
  struct syntax_handler {
!      const char *syntax_oid;
!      const char *desc;
       int displaytype;
       int (*displayTypeFunc)(const char *attr, const char *syn_oid);
***************
*** 42,46 ****
  
  typedef struct _display_type_handler {
!      char *name;
       gboolean selectable;
       gboolean show_in_search_result;
--- 42,46 ----
  
  typedef struct _display_type_handler {
!      const char *name;
       gboolean selectable;
       gboolean show_in_search_result;

Index: template.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/template.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** template.c	2 Nov 2003 07:20:44 -0000	1.14
--- template.c	3 Nov 2003 21:07:58 -0000	1.15
***************
*** 503,507 ****
   * move item by name from source clist to destination clist
   */
! void move_objectclass(GtkWidget *source, GtkWidget *destination, char *objectclass)
  {
       int row;
--- 503,508 ----
   * move item by name from source clist to destination clist
   */
! void move_objectclass(GtkWidget *source, GtkWidget *destination, 
! 		      const char *objectclass)
  {
       int row;
***************
*** 761,765 ****
   * return row number
   */
! int get_clist_row_by_text(GtkWidget *clist, char *text)
  {
       int i, row;
--- 762,766 ----
   * return row number
   */
! int get_clist_row_by_text(GtkWidget *clist, const char *text)
  {
       int i, row;

Index: template.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/template.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** template.h	2 Nov 2003 07:20:44 -0000	1.6
--- template.h	3 Nov 2003 21:07:58 -0000	1.7
***************
*** 46,55 ****
  void arrow_button_callback(GtkWidget *widget, GtkWidget *window);
  int clistcasecmp(GtkCList *clist, gconstpointer row1, gconstpointer row2);
! void move_objectclass(GtkWidget *source, GtkWidget *destination, char *objectclass);
  void save_template_callback(GtkWidget *widget, GtkWidget *window);
  struct gq_template *window2template(GtkWidget *window);
  void fill_clist_templates(GtkWidget *clist);
  char *get_clist_selection(GtkWidget *clist);
! int get_clist_row_by_text(GtkWidget *clist, char *text);
  
  
--- 46,56 ----
  void arrow_button_callback(GtkWidget *widget, GtkWidget *window);
  int clistcasecmp(GtkCList *clist, gconstpointer row1, gconstpointer row2);
! void move_objectclass(GtkWidget *source, GtkWidget *destination, 
! 		      const char *objectclass);
  void save_template_callback(GtkWidget *widget, GtkWidget *window);
  struct gq_template *window2template(GtkWidget *window);
  void fill_clist_templates(GtkWidget *clist);
  char *get_clist_selection(GtkWidget *clist);
! int get_clist_row_by_text(GtkWidget *clist, const char *text);
  
  

Index: util.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/util.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** util.c	2 Nov 2003 17:41:05 -0000	1.86
--- util.c	3 Nov 2003 21:07:58 -0000	1.87
***************
*** 450,454 ****
  	       goto done;
  	  }
- 	  /* nothing usable found - retry */
       }
  
--- 450,453 ----
***************
*** 711,718 ****
  		    for (e = ldap_first_entry(ld, res); e ; 
  			 e = ldap_next_entry(ld, e)) {
! 			 char *dn = ldap_get_dn(ld, e);
  			 gboolean delok = delete_entry_full(delete_context, 
! 							    server, dn, TRUE);
! 			 if (dn) ldap_memfree(dn);
  
  			 if (delok) {
--- 710,717 ----
  		    for (e = ldap_first_entry(ld, res); e ; 
  			 e = ldap_next_entry(ld, e)) {
! 			 char *dn2 = ldap_get_dn(ld, e);
  			 gboolean delok = delete_entry_full(delete_context, 
! 							    server, dn2, TRUE);
! 			 if (dn2) ldap_memfree(dn2);
  
  			 if (delok) {

Index: util.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/util.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** util.h	2 Nov 2003 17:41:05 -0000	1.29
--- util.h	3 Nov 2003 21:07:58 -0000	1.30
***************
*** 67,73 ****
  
  struct tokenlist {
!      int token;
!      char keyword[32];
!      gpointer data;
  };
  
--- 67,73 ----
  
  struct tokenlist {
!      const int token;
!      const char keyword[32];
!      const gpointer data;
  };
  

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/xmlparse.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** xmlparse.c	9 Oct 2003 18:00:26 -0000	1.7
--- xmlparse.c	3 Nov 2003 21:07:58 -0000	1.8
***************
*** 4,10 ****
      Copyright (C) 2002-2003 Peter Stamfest
      
-     This file is
-     Copyright (c) 2003 by Peter Stamfest <pe...@st...>
- 
      This program is released under the Gnu General Public License with
      the additional exemption that compiling, linking, and/or using
--- 4,7 ----
***************
*** 178,182 ****
  	    /* maybe, maybe, maybe..... (J Joplin) */
  
- 	    int i;
  	    int ok = 1;
  	    /* check context */
--- 175,178 ----