[gq-commit] gq/src browse.h,1.24,1.25 common.h,1.20,1.21 mainwin.h,1.14,1.15 schemabrowse.h,1.7,1.8 search.h,1.5,1.6

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

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

Modified Files:
	browse.h common.h mainwin.h schemabrowse.h search.h 
Log Message:
* Slight reshuffling of *_MODE defines
* Added assertions for commonly used type-casting macros
  (I want to use assertions heavily in the future - I do it in other projects
   as well)


Index: browse.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/browse.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** browse.h	28 Sep 2003 03:26:25 -0000	1.24
--- browse.h	28 Sep 2003 23:39:18 -0000	1.25
***************
*** 29,33 ****
  #include "common.h"
  
! #define BROWSETAB(tab) ((struct tab_browse *)tab->modeinfo)
  struct tab_browse {
       GString *cur_dn;
--- 29,33 ----
  #include "common.h"
  
! #define BROWSETAB(tab) (assert(tab->type == BROWSE_MODE), ((struct tab_browse *)tab->modeinfo))
  struct tab_browse {
       GString *cur_dn;

Index: common.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/common.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** common.h	26 Sep 2003 23:30:29 -0000	1.20
--- common.h	28 Sep 2003 23:39:18 -0000	1.21
***************
*** 33,36 ****
--- 33,39 ----
  #include <gtk/gtk.h>
  
+ #include <config.h>  /* NDEBUG - possibly */
+ #include <assert.h>
+ 
  #define MAX_SERVERNAME_LEN    64
  #define MAX_HOSTNAME_LEN      1024
***************
*** 61,64 ****
--- 64,70 ----
  };
  
+ #define SEARCH_MODE       1
+ #define BROWSE_MODE       2
+ #define SCHEMA_MODE       3
  
  struct tab {
***************
*** 84,87 ****
--- 90,94 ----
       char enteredpw[MAX_BINDPW_LEN];
       int bindtype;
+      char saslmechanism[128];
       char searchattr[MAX_ATTR_LEN];
       int maxentries;

Index: mainwin.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/mainwin.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** mainwin.h	27 Sep 2003 09:39:42 -0000	1.14
--- mainwin.h	28 Sep 2003 23:39:18 -0000	1.15
***************
*** 39,45 ****
  			"\n\nhttp://biot.com/gq/"
  
- #define SEARCH_MODE       1
- #define BROWSE_MODE       2
- #define SCHEMA_MODE       3
  
  extern GList *tablist;
--- 39,42 ----

Index: schemabrowse.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/schemabrowse.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** schemabrowse.h	26 Sep 2003 23:30:29 -0000	1.7
--- schemabrowse.h	28 Sep 2003 23:39:18 -0000	1.8
***************
*** 29,34 ****
  #include <ldap_schema.h>
  
  
! #define SCHEMATAB(tab) ((struct tab_schema *)tab->modeinfo)
  struct tab_schema {
       GtkWidget *treeroot;
--- 29,35 ----
  #include <ldap_schema.h>
  
+ #include "common.h"
  
! #define SCHEMATAB(tab) (assert(tab->mode == SCHEMA_MODE), (struct tab_schema *)tab->modeinfo)
  struct tab_schema {
       GtkWidget *treeroot;

Index: search.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/search.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** search.h	26 Sep 2003 23:30:29 -0000	1.5
--- search.h	28 Sep 2003 23:39:18 -0000	1.6
***************
*** 27,31 ****
  #define GQ_SEARCH_H_INCLUDED
  
! #define SEARCHTAB(tab) ((struct tab_search *)tab->modeinfo)
  struct tab_search {
       GtkWidget *serverlist_combo;
--- 27,33 ----
  #define GQ_SEARCH_H_INCLUDED
  
! #include "common.h"
! 
! #define SEARCHTAB(tab) (assert(tab->mode == SEARCH_MODE), (struct tab_search *)tab->modeinfo)
  struct tab_search {
       GtkWidget *serverlist_combo;