At least some compilers don't allow warning pragmas inside functions.

So wrap the entire function in USES_APPLE_DEPRECATED_API/USES_APPLE_RST.

Change-Id: I6ae3e8ecc40bc407e6f7156ccc5d9dd8c51d650d
Reviewed-on: https://code.wireshark.org/review/3885
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 4 insertions, 20 deletions

diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c
index 076857388b..e47da5cb6b 100644
--- a/asn1/kerberos/packet-kerberos-template.c
+++ b/asn1/kerberos/packet-kerberos-template.c
@@ -282,6 +282,7 @@ read_keytab_file(const char *filename _U_)
 
 static krb5_context krb5_ctx;
 
+USES_APPLE_DEPRECATED_API
 void
 read_keytab_file(const char *filename)
 {
@@ -298,27 +299,21 @@ read_keytab_file(const char *filename)
 
 	if(first_time){
 		first_time=FALSE;
-USES_APPLE_DEPRECATED_API
 		ret = krb5_init_context(&krb5_ctx);
-USES_APPLE_RST
 		if(ret && ret != KRB5_CONFIG_CANTOPEN){
 			return;
 		}
 	}
 
 	/* should use a file in the wireshark users dir */
-USES_APPLE_DEPRECATED_API
 	ret = krb5_kt_resolve(krb5_ctx, filename, &keytab);
-USES_APPLE_RST
 	if(ret){
 		fprintf(stderr, "KERBEROS ERROR: Badly formatted keytab filename :%s\n",filename);
 
 		return;
 	}
 
-USES_APPLE_DEPRECATED_API
 	ret = krb5_kt_start_seq_get(krb5_ctx, keytab, &cursor);
-USES_APPLE_RST
 	if(ret){
 		fprintf(stderr, "KERBEROS ERROR: Could not open or could not read from keytab file :%s\n",filename);
 		return;
@@ -328,9 +323,7 @@ USES_APPLE_RST
 		new_key=(enc_key_t *)g_malloc(sizeof(enc_key_t));
 		new_key->fd_num = -1;
 		new_key->next=enc_key_list;
-USES_APPLE_DEPRECATED_API
 		ret = krb5_kt_next_entry(krb5_ctx, keytab, &key, &cursor);
-USES_APPLE_RST
 		if(ret==0){
 			int i;
 			char *pos;
@@ -354,12 +347,10 @@ USES_APPLE_RST
 		}
 	}while(ret==0);
 
-USES_APPLE_DEPRECATED_API
 	ret = krb5_kt_end_seq_get(krb5_ctx, keytab, &cursor);
 	if(ret){
 		krb5_kt_close(krb5_ctx, keytab);
 	}
-USES_APPLE_RST
 }
 
 
@@ -406,9 +397,7 @@ decrypt_krb5_data(proto_tree *tree _U_, packet_info *pinfo,
 		key.key.enctype=ek->keytype;
 		key.key.length=ek->keylength;
 		key.key.contents=ek->keyvalue;
-USES_APPLE_DEPRECATED_API
 		ret = krb5_c_decrypt(krb5_ctx, &(key.key), usage, 0, &input, &data);
-USES_APPLE_RST
 		if(ret == 0){
 			char *user_data;
 
@@ -428,10 +417,12 @@ USES_APPLE_RST
 
 	return NULL;
 }
+USES_APPLE_RST
 
 #elif defined(HAVE_HEIMDAL_KERBEROS)
 static krb5_context krb5_ctx;
 
+USES_APPLE_DEPRECATED_API
 void
 read_keytab_file(const char *filename)
 {
@@ -455,18 +446,14 @@ read_keytab_file(const char *filename)
 	}
 
 	/* should use a file in the wireshark users dir */
-USES_APPLE_DEPRECATED_API
 	ret = krb5_kt_resolve(krb5_ctx, filename, &keytab);
-USES_APPLE_RST
 	if(ret){
 		fprintf(stderr, "KERBEROS ERROR: Could not open keytab file :%s\n",filename);
 
 		return;
 	}
 
-USES_APPLE_DEPRECATED_API
 	ret = krb5_kt_start_seq_get(krb5_ctx, keytab, &cursor);
-USES_APPLE_RST
 	if(ret){
 		fprintf(stderr, "KERBEROS ERROR: Could not read from keytab file :%s\n",filename);
 		return;
@@ -476,9 +463,7 @@ USES_APPLE_RST
 		new_key=g_malloc(sizeof(enc_key_t));
 		new_key->fd_num = -1;
 		new_key->next=enc_key_list;
-USES_APPLE_DEPRECATED_API
 		ret = krb5_kt_next_entry(krb5_ctx, keytab, &key, &cursor);
-USES_APPLE_RST
 		if(ret==0){
 			unsigned int i;
 			char *pos;
@@ -501,14 +486,13 @@ USES_APPLE_RST
 		}
 	}while(ret==0);
 
-USES_APPLE_DEPRECATED_API
 	ret = krb5_kt_end_seq_get(krb5_ctx, keytab, &cursor);
 	if(ret){
 		krb5_kt_close(krb5_ctx, keytab);
 	}
-USES_APPLE_RST
 
 }
+USES_APPLE_RST
 
 
 guint8 *