[dovecot-cvs] dovecot/src/auth auth-cyrus-sasl2.c,1.1,1.2 auth-digest-md5.c,1.18,1.19 auth-plain.c,1.10,1.11 auth.c,1.8,1.9 auth.h,1.6,1.7 cookie.h,1.4,1.5 userinfo-passwd-file.c,1.24,1.25

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/auth
In directory danu:/tmp/cvs-serv27659/auth

Modified Files:
	auth-cyrus-sasl2.c auth-digest-md5.c auth-plain.c auth.c 
	auth.h cookie.h userinfo-passwd-file.c 
Log Message:
Naming change for function typedefs.



Index: auth-cyrus-sasl2.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/auth-cyrus-sasl2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- auth-cyrus-sasl2.c	5 Jan 2003 15:19:50 -0000	1.1
+++ auth-cyrus-sasl2.c	11 Jan 2003 19:55:56 -0000	1.2
@@ -31,7 +31,7 @@
 static void auth_sasl_continue(struct cookie_data *cookie,
 			       struct auth_continued_request_data *request,
 			       const unsigned char *data,
-			       AuthCallback callback, void *context)
+			       auth_callback_t callback, void *context)
 {
 	struct auth_context *ctx = cookie->context;
 	struct auth_reply_data reply;
@@ -124,7 +124,7 @@
 
 void auth_cyrus_sasl_init(unsigned int login_pid,
 			  struct auth_init_request_data *request,
-			  AuthCallback callback, void *context)
+			  auth_callback_t callback, void *context)
 {
 	static const char *propnames[] = {
 		SASL_AUX_UIDNUM,

Index: auth-digest-md5.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/auth-digest-md5.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- auth-digest-md5.c	9 Jan 2003 12:19:07 -0000	1.18
+++ auth-digest-md5.c	11 Jan 2003 19:55:56 -0000	1.19
@@ -522,7 +522,7 @@
 auth_digest_md5_continue(struct cookie_data *cookie,
 			 struct auth_continued_request_data *request,
 			 const unsigned char *data,
-			 AuthCallback callback, void *context)
+			 auth_callback_t callback, void *context)
 {
 	struct auth_data *auth = cookie->context;
 	struct auth_reply_data reply;
@@ -583,7 +583,7 @@
 
 static void auth_digest_md5_init(unsigned int login_pid,
 				 struct auth_init_request_data *request,
-				 AuthCallback callback, void *context)
+				 auth_callback_t callback, void *context)
 {
 	struct cookie_data *cookie;
 	struct auth_reply_data reply;

Index: auth-plain.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/auth-plain.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- auth-plain.c	9 Jan 2003 12:19:07 -0000	1.10
+++ auth-plain.c	11 Jan 2003 19:55:56 -0000	1.11
@@ -9,7 +9,7 @@
 static void auth_plain_continue(struct cookie_data *cookie,
 				struct auth_continued_request_data *request,
 				const unsigned char *data,
-				AuthCallback callback, void *context)
+				auth_callback_t callback, void *context)
 {
 	struct auth_cookie_reply_data *cookie_reply = cookie->context;
 	struct auth_reply_data reply;
@@ -88,7 +88,7 @@
 
 static void auth_plain_init(unsigned int login_pid,
 			    struct auth_init_request_data *request,
-			    AuthCallback callback, void *context)
+			    auth_callback_t callback, void *context)
 {
 	struct cookie_data *cookie;
 	struct auth_reply_data reply;

Index: auth.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/auth.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- auth.c	5 Jan 2003 15:19:50 -0000	1.8
+++ auth.c	11 Jan 2003 19:55:56 -0000	1.9
@@ -55,7 +55,7 @@
 
 void auth_init_request(unsigned int login_pid,
 		       struct auth_init_request_data *request,
-		       AuthCallback callback, void *context)
+		       auth_callback_t callback, void *context)
 {
 	struct auth_module_list *list;
 
@@ -88,7 +88,7 @@
 void auth_continue_request(unsigned int login_pid,
 			   struct auth_continued_request_data *request,
 			   const unsigned char *data,
-			   AuthCallback callback, void *context)
+			   auth_callback_t callback, void *context)
 {
 	struct cookie_data *cookie_data;
 

Index: auth.h
===================================================================
RCS file: /home/cvs/dovecot/src/auth/auth.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- auth.h	5 Jan 2003 15:19:50 -0000	1.6
+++ auth.h	11 Jan 2003 19:55:56 -0000	1.7
@@ -3,15 +3,15 @@
 
 #include "auth-interface.h"
 
-typedef void (*AuthCallback)(struct auth_reply_data *reply,
-			     const void *data, void *context);
+typedef void (*auth_callback_t)(struct auth_reply_data *reply,
+				const void *data, void *context);
 
 struct auth_module {
 	enum auth_mech mech;
 
 	void (*init)(unsigned int login_pid,
 		     struct auth_init_request_data *request,
-		     AuthCallback callback, void *context);
+		     auth_callback_t callback, void *context);
 };
 
 extern enum auth_mech auth_mechanisms;
@@ -22,16 +22,16 @@
 
 void auth_init_request(unsigned int login_pid,
 		       struct auth_init_request_data *request,
-		       AuthCallback callback, void *context);
+		       auth_callback_t callback, void *context);
 void auth_continue_request(unsigned int login_pid,
 			   struct auth_continued_request_data *request,
 			   const unsigned char *data,
-			   AuthCallback callback, void *context);
+			   auth_callback_t callback, void *context);
 
 void auth_cyrus_sasl_init_lib(void);
 void auth_cyrus_sasl_init(unsigned int login_pid,
 			  struct auth_init_request_data *request,
-			  AuthCallback callback, void *context);
+			  auth_callback_t callback, void *context);
 
 void auth_init(void);
 void auth_deinit(void);

Index: cookie.h
===================================================================
RCS file: /home/cvs/dovecot/src/auth/cookie.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cookie.h	5 Jan 2003 13:09:51 -0000	1.4
+++ cookie.h	11 Jan 2003 19:55:56 -0000	1.5
@@ -11,7 +11,7 @@
 	void (*auth_continue)(struct cookie_data *cookie,
 			      struct auth_continued_request_data *request,
 			      const unsigned char *data,
-			      AuthCallback callback, void *context);
+			      auth_callback_t callback, void *context);
 
 	/* fills reply from cookie, returns TRUE if successful */
 	int (*auth_fill_reply)(struct cookie_data *cookie,
@@ -22,8 +22,6 @@
 
 	void *context;
 };
-
-typedef void (*CookieFreeFunc)(void *data);
 
 /* data->cookie is filled */
 void cookie_add(struct cookie_data *data);

Index: userinfo-passwd-file.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/userinfo-passwd-file.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- userinfo-passwd-file.c	11 Jan 2003 15:29:46 -0000	1.24
+++ userinfo-passwd-file.c	11 Jan 2003 19:55:56 -0000	1.25
@@ -351,7 +351,7 @@
 	pw->stamp = st.st_mtime;
 	pw->fd = fd;
 	pw->users = hash_create(default_pool, pool, 100,
-				str_hash, (HashCompareFunc) strcmp);
+				str_hash, (hash_cmp_callback_t)strcmp);
 
 	passwd_file_parse_file(pw);
 	return pw;