changes for proper casting

[to make compiler shut up]

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@214 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/krb5/asn.1/encode.h b/src/include/krb5/asn.1/encode.h
index 8ed75e6ec1f4062390525523b6d6cdda50ac1385..77d0f64ffa3c922fcb9185bab8a6719622f5eb68 100644 (file)
--- a/src/include/krb5/asn.1/encode.h
+++ b/src/include/krb5/asn.1/encode.h
@@ -16,12 +16,16 @@
 #ifndef __KRB5_ENCODE_DEFS__
 #define __KRB5_ENCODE_DEFS__
 
+typedef        int (*encoder_func) PROTOTYPE((PE *, int, int, char *, krb5_pointer));
+typedef void (*free_func) PROTOTYPE((krb5_pointer ));
+typedef krb5_pointer (*translator_func) PROTOTYPE((krb5_pointer, int * ));
+typedef int (*decoder_func) PROTOTYPE((PE, int, int, char *, krb5_pointer));
 
 /* encode.c */
 krb5_error_code encode_generic
     PROTOTYPE((krb5_pointer,
               krb5_data **,
-              int (* )PROTOTYPE ((PE,int,int,char *,krb5_pointer )),
+              int (* )PROTOTYPE ((PE *,int,int,char *,krb5_pointer )),
               krb5_pointer (* )PROTOTYPE ((krb5_pointer,int *)),
               void (* )PROTOTYPE ((krb5_pointer ))));
 krb5_error_code decode_generic
@@ -32,148 +36,148 @@ krb5_error_code decode_generic
                   void (* )PROTOTYPE ((krb5_pointer ))));
 
 #define encode_krb5_authenticator(pauth, output) \
-    encode_generic(pauth,  output, \
-                  encode_KRB5_Authenticator, \
-                  krb5_authenticator2KRB5_Authenticator, \
-                  free_KRB5_Authenticator)
-#define decode_krb5_authenticator(pauth, output) \
-    decode_generic(pauth, (krb5_pointer *) output, \
-                  decode_KRB5_Authenticator, \
-                  KRB5_Authenticator2krb5_authenticator, \
-                  free_KRB5_Authenticator)
+    encode_generic((krb5_pointer)pauth,  output, \
+                  (encoder_func) encode_KRB5_Authenticator, \
+                  (translator_func) krb5_authenticator2KRB5_Authenticator, \
+                  (free_func) free_KRB5_Authenticator)
+#define decode_KRB5_authenticator(pauth, output) \
+    decode_generic((krb5_pointer)pauth, (krb5_pointer *) output, \
+                  (decoder_func) decode_KRB5_Authenticator, \
+                  (translator_func) KRB5_Authenticator2krb5_authenticator, \
+                  (free_func) free_KRB5_Authenticator)
                                                
 #define encode_krb5_ticket(ptick, output) \
-    encode_generic(ptick,  output, \
-                  encode_KRB5_Ticket, \
-                  krb5_ticket2KRB5_Ticket, \
-                  free_KRB5_Ticket)
+    encode_generic((krb5_pointer)ptick,  output, \
+                  (encoder_func) encode_KRB5_Ticket, \
+                  (translator_func) krb5_ticket2KRB5_Ticket, \
+                  (free_func) free_KRB5_Ticket)
 #define decode_krb5_ticket(ptick, output) \
-    decode_generic(ptick, (krb5_pointer *) output, \
-                  decode_KRB5_Ticket, \
-                  KRB5_Ticket2krb5_ticket, \
-                  free_KRB5_Ticket)
+    decode_generic((krb5_pointer)ptick, (krb5_pointer *) output, \
+                  (decoder_func) decode_KRB5_Ticket, \
+                  (translator_func) KRB5_Ticket2krb5_ticket, \
+                  (free_func) free_KRB5_Ticket)
 
 #define encode_krb5_enc_tkt_part(ptick, output) \
-    encode_generic(ptick,  output, \
-                  encode_KRB5_EncTicketPart, \
-                  krb5_enc_tkt_part2KRB5_EncTicketPart, \
-                  free_KRB5_EncTicketPart)
+    encode_generic((krb5_pointer)ptick,  output, \
+                  (encoder_func) encode_KRB5_EncTicketPart, \
+                  (translator_func) krb5_enc_tkt_part2KRB5_EncTicketPart, \
+                  (free_func) free_KRB5_EncTicketPart)
 #define decode_krb5_enc_tkt_part(ptick, output) \
-    decode_generic(ptick, (krb5_pointer *) output, \
-                  decode_KRB5_EncTicketPart, \
-                  KRB5_EncTicketPart2krb5_enc_tkt_part, \
-                  free_KRB5_EncTicketPart)
+    decode_generic((krb5_pointer)ptick, (krb5_pointer *) output, \
+                  (decoder_func) decode_KRB5_EncTicketPart, \
+                  (translator_func) KRB5_EncTicketPart2krb5_enc_tkt_part, \
+                  (free_func) free_KRB5_EncTicketPart)
 
 #define encode_krb5_as_req(req, output) \
-    encode_generic(req, output, \
-                  encode_KRB5_AS__REQ, \
-                  krb5_as_req2KRB5_AS__REQ, \
-                  free_KRB5_AS__REQ)
+    encode_generic((krb5_pointer)req, output, \
+                  (encoder_func) encode_KRB5_AS__REQ, \
+                  (translator_func) krb5_as_req2KRB5_AS__REQ, \
+                  (free_func) free_KRB5_AS__REQ)
 #define decode_krb5_as_req(req, output) \
-    decode_generic(req, (krb5_pointer *) output, \
-                  decode_KRB5_AS__REQ, \
-                  KRB5_AS__REQ2krb5_as_req, \
-                  free_KRB5_AS__REQ)
+    decode_generic((krb5_pointer)req, (krb5_pointer *) output, \
+                  (decoder_func) decode_KRB5_AS__REQ, \
+                  (translator_func) KRB5_AS__REQ2krb5_as_req, \
+                  (free_func) free_KRB5_AS__REQ)
 
 #define encode_krb5_as_rep(req, output) \
-    encode_generic(req, output, \
-                  encode_KRB5_KDC__REP, \
-                  krb5_as_rep2KRB5_KDC__REP, \
-                  free_KRB5_KDC__REP)
+    encode_generic((krb5_pointer)req, output, \
+                  (encoder_func) encode_KRB5_KDC__REP, \
+                  (translator_func) krb5_as_rep2KRB5_KDC__REP, \
+                  (free_func) free_KRB5_KDC__REP)
 #define decode_krb5_as_rep(req, output) \
-    decode_generic(req, (krb5_pointer *) output, \
-                  decode_KRB5_KDC__REP, \
-                  KRB5_KDC__REP2krb5_as_rep, \
-                  free_KRB5_KDC__REP)
+    decode_generic((krb5_pointer)req, (krb5_pointer *) output, \
+                  (decoder_func) decode_KRB5_KDC__REP, \
+                  (translator_func) KRB5_KDC__REP2krb5_as_rep, \
+                  (free_func) free_KRB5_KDC__REP)
 
 #define encode_krb5_enc_kdc_rep_part(req, output) \
-    encode_generic(req, output, \
-                  encode_KRB5_EncKDCRepPart, \
-                  krb5_enc_kdc_rep_part2KRB5_EncKDCRepPart, \
-                  free_KRB5_EncKDCRepPart)
+    encode_generic((krb5_pointer)req, output, \
+                  (encoder_func) encode_KRB5_EncKDCRepPart, \
+                  (translator_func) krb5_enc_kdc_rep_part2KRB5_EncKDCRepPart, \
+                  (free_func) free_KRB5_EncKDCRepPart)
 #define decode_krb5_enc_kdc_rep_part(req, output) \
-    decode_generic(req, (krb5_pointer *) output, \
-                  decode_KRB5_EncKDCRepPart, \
-                  KRB5_EncKDCRepPart2krb5_enc_kdc_rep_part, \
-                  free_KRB5_EncKDCRepPart)
+    decode_generic((krb5_pointer)req, (krb5_pointer *) output, \
+                  (decoder_func) decode_KRB5_EncKDCRepPart, \
+                  (translator_func) KRB5_EncKDCRepPart2krb5_enc_kdc_rep_part, \
+                  (free_func) free_KRB5_EncKDCRepPart)
 
 #define encode_krb5_tgs_rep(req, output) \
-    encode_generic(req, output, \
-                  encode_KRB5_KDC__REP, \
-                  krb5_tgs_rep2KRB5_KDC__REP, \
-                  free_KRB5_KDC__REP)
+    encode_generic((krb5_pointer)req, output, \
+                  (encoder_func) encode_KRB5_KDC__REP, \
+                  (translator_func) krb5_tgs_rep2KRB5_KDC__REP, \
+                  (free_func) free_KRB5_KDC__REP)
 #define decode_krb5_tgs_rep(req, output) \
-    decode_generic(req, (krb5_pointer *) output, \
-                  decode_KRB5_KDC__REP, \
-                  KRB5_KDC__REP2krb5_tgs_rep, \
-                  free_KRB5_KDC__REP)
+    decode_generic((krb5_pointer)req, (krb5_pointer *) output, \
+                  (decoder_func) decode_KRB5_KDC__REP, \
+                  (translator_func) KRB5_KDC__REP2krb5_tgs_rep, \
+                  (free_func) free_KRB5_KDC__REP)
 
 
 #define encode_krb5_ap_req(req, output) \
-    encode_generic(req,  output, \
-                  encode_KRB5_AP__REQ, \
-                  krb5_ap_req2KRB5_AP__REQ, \
-                  free_KRB5_AP__REQ)
+    encode_generic((krb5_pointer)req,  output, \
+                  (encoder_func) encode_KRB5_AP__REQ, \
+                  (translator_func) krb5_ap_req2KRB5_AP__REQ, \
+                  (free_func) free_KRB5_AP__REQ)
 #define decode_krb5_ap_req(req, output) \
-    decode_generic(req, (krb5_pointer *) output, \
-                  decode_KRB5_AP__REQ, \
-                  KRB5_AP__REQ2krb5_ap_req, \
-                  free_KRB5_AP__REQ)
+    decode_generic((krb5_pointer)req, (krb5_pointer *) output, \
+                  (decoder_func) decode_KRB5_AP__REQ, \
+                  (translator_func) KRB5_AP__REQ2krb5_ap_req, \
+                  (free_func) free_KRB5_AP__REQ)
 
 #define encode_krb5_ap_rep(req, output) \
-    encode_generic(req, output, \
-                  encode_KRB5_AP__REP, \
-                  krb5_ap_rep2KRB5_AP__REP, \
-                  free_KRB5_AP__REP)
+    encode_generic((krb5_pointer)req, output, \
+                  (encoder_func) encode_KRB5_AP__REP, \
+                  (translator_func) krb5_ap_rep2KRB5_AP__REP, \
+                  (free_func) free_KRB5_AP__REP)
 #define decode_krb5_ap_rep(req, output) \
-    decode_generic(req, (krb5_pointer *) output, \
-                  decode_KRB5_AP__REP, \
-                  KRB5_AP__REP2krb5_ap_rep, \
-                  free_KRB5_AP__REP)
+    decode_generic((krb5_pointer)req, (krb5_pointer *) output, \
+                  (decoder_func) decode_KRB5_AP__REP, \
+                  (translator_func) KRB5_AP__REP2krb5_ap_rep, \
+                  (free_func) free_KRB5_AP__REP)
 
 #define encode_krb5_tgs_req(req, output) \
-    encode_generic(req, output, \
-                  encode_KRB5_TGS__REQ, \
-                  krb5_tgs_req2KRB5_TGS__REQ, \
-                  free_KRB5_TGS__REQ)
+    encode_generic((krb5_pointer)req, output, \
+                  (encoder_func) encode_KRB5_TGS__REQ, \
+                  (translator_func) krb5_tgs_req2KRB5_TGS__REQ, \
+                  (free_func) free_KRB5_TGS__REQ)
 #define decode_krb5_tgs_req(req, output) \
-    decode_generic(req, (krb5_pointer *) output, \
-                  decode_KRB5_TGS__REQ, \
-                  KRB5_TGS__REQ2krb5_tgs_req, \
-                  free_KRB5_TGS__REQ)
+    decode_generic((krb5_pointer)req, (krb5_pointer *) output, \
+                  (decoder_func) decode_KRB5_TGS__REQ, \
+                  (translator_func) KRB5_TGS__REQ2krb5_tgs_req, \
+                  (free_func) free_KRB5_TGS__REQ)
 
 #define encode_krb5_safe(req, output) \
-    encode_generic(req, output, \
-                  encode_KRB5_KRB__SAFE, \
-                  krb5_safe2KRB5_KRB__SAFE, \
-                  free_KRB5_KRB__SAFE)
+    encode_generic((krb5_pointer)req, output, \
+                  (encoder_func) encode_KRB5_KRB__SAFE, \
+                  (translator_func) krb5_safe2KRB5_KRB__SAFE, \
+                  (free_func) free_KRB5_KRB__SAFE)
 #define decode_krb5_safe(req, output) \
-    decode_generic(req, (krb5_pointer *) output, \
-                  decode_KRB5_KRB__SAFE, \
-                  KRB5_KRB__SAFE2krb5_safe, \
-                  free_KRB5_KRB__SAFE)
+    decode_generic((krb5_pointer)req, (krb5_pointer *) output, \
+                  (decoder_func) decode_KRB5_KRB__SAFE, \
+                  (translator_func) KRB5_KRB__SAFE2krb5_safe, \
+                  (free_func) free_KRB5_KRB__SAFE)
 
 #define encode_krb5_priv(req, output) \
-    encode_generic(req, output, \
-                  encode_KRB5_KRB__PRIV, \
-                  krb5_priv2KRB5_KRB__PRIV, \
-                  free_KRB5_KRB__PRIV)
+    encode_generic((krb5_pointer)req, output, \
+                  (encoder_func) encode_KRB5_KRB__PRIV, \
+                  (translator_func) krb5_priv2KRB5_KRB__PRIV, \
+                  (free_func) free_KRB5_KRB__PRIV)
 #define decode_krb5_priv(req, output) \
-    decode_generic(req, (krb5_pointer *) output, \
-                  decode_KRB5_KRB__PRIV, \
-                  KRB5_KRB__PRIV2krb5_priv, \
-                  free_KRB5_KRB__PRIV)
+    decode_generic((krb5_pointer)req, (krb5_pointer *) output, \
+                  (decoder_func) decode_KRB5_KRB__PRIV, \
+                  (translator_func) KRB5_KRB__PRIV2krb5_priv, \
+                  (free_func) free_KRB5_KRB__PRIV)
 
 #define encode_krb5_error(req, output) \
-    encode_generic(req, output, \
-                  encode_KRB5_KRB__ERROR, \
-                  krb5_error2KRB5_KRB__ERROR, \
-                  free_KRB5_KRB__ERROR)
+    encode_generic((krb5_pointer)req, output, \
+                  (encoder_func) encode_KRB5_KRB__ERROR, \
+                  (translator_func) krb5_error2KRB5_KRB__ERROR, \
+                  (free_func) free_KRB5_KRB__ERROR)
 #define decode_krb5_error(req, output) \
-    decode_generic(req, (krb5_pointer *) output, \
-                  decode_KRB5_KRB__ERROR, \
-                  KRB5_KRB__ERROR2krb5_error, \
-                  free_KRB5_KRB__ERROR)
+    decode_generic((krb5_pointer)req, (krb5_pointer *) output, \
+                  (decoder_func) decode_KRB5_KRB__ERROR, \
+                  (translator_func) KRB5_KRB__ERROR2krb5_error, \
+                  (free_func) free_KRB5_KRB__ERROR)
 
 
 #endif /* __KRB5_ENCODE_DEFS__ */