Move more CC_HINTs to headers

FreeRADIUS · Apr 30, 2014 · 50a4513 · 50a4513
1 parent 007de2d
commit 50a4513
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 29 deletions.
diff --git a/src/include/radiusd.h b/src/include/radiusd.h
@@ -703,7 +703,7 @@ int radius_evaluate_map(REQUEST *request, int modreturn, int depth,
 			fr_cond_t const *c);
 int radius_evaluate_cond(REQUEST *request, int modreturn, int depth,
 			 fr_cond_t const *c);
-void radius_pairmove(REQUEST *request, VALUE_PAIR **to, VALUE_PAIR *from, bool do_xlat);
+void radius_pairmove(REQUEST *request, VALUE_PAIR **to, VALUE_PAIR *from, bool do_xlat) CC_HINT(nonnull);
 
 VALUE_PAIR **radius_list(REQUEST *request, pair_lists_t list);
 TALLOC_CTX *radius_list_ctx(REQUEST *request, pair_lists_t list_name);

diff --git a/src/main/evaluate.c b/src/main/evaluate.c
@@ -894,7 +894,7 @@ int radius_evaluate_cond(REQUEST *request, int modreturn, int depth,
  *	only paircopy() those attributes that we're really going to
  *	use.
  */
-void CC_HINT(nonnull) radius_pairmove(REQUEST *request, VALUE_PAIR **to, VALUE_PAIR *from, bool do_xlat)
+void radius_pairmove(REQUEST *request, VALUE_PAIR **to, VALUE_PAIR *from, bool do_xlat)
 {
 	int i, j, count, from_count, to_count, tailto;
 	vp_cursor_t cursor;

diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c
@@ -153,7 +153,7 @@ static int mod_instantiate(UNUSED CONF_SECTION *conf, void *instance)
 /*
  *	Common attr_filter checks
  */
-static rlm_rcode_t CC_HINT(nonull(1,2)) attr_filter_common(void *instance, REQUEST *request, RADIUS_PACKET *packet)
+static rlm_rcode_t CC_HINT(nonnull(1,2)) attr_filter_common(void *instance, REQUEST *request, RADIUS_PACKET *packet)
 {
 	rlm_attr_filter_t *inst = instance;
 	VALUE_PAIR	*vp;

diff --git a/src/modules/rlm_eap/eap.c b/src/modules/rlm_eap/eap.c
@@ -492,7 +492,7 @@ eap_rcode_t eap_method_select(rlm_eap_t *inst, eap_handler_t *handler)
  *	Set the RADIUS reply codes based on EAP request codes.  Append
  *	any additonal VPs to RADIUS reply
  */
-rlm_rcode_t CC_HINT(nonnull) eap_compose(eap_handler_t *handler)
+rlm_rcode_t eap_compose(eap_handler_t *handler)
 {
 	VALUE_PAIR *vp;
 	eap_packet_raw_t *eap_packet;

diff --git a/src/modules/rlm_eap/libeap/eap_tls.c b/src/modules/rlm_eap/libeap/eap_tls.c
@@ -136,7 +136,7 @@ int eaptls_start(EAP_DS *eap_ds, int peap_flag)
 	return 1;
 }
 
-int CC_HINT(nonnull) eaptls_success(eap_handler_t *handler, int peap_flag)
+int eaptls_success(eap_handler_t *handler, int peap_flag)
 {
 	EAPTLS_PACKET	reply;
 	REQUEST *request = handler->request;

diff --git a/src/modules/rlm_eap/libeap/eap_tls.h b/src/modules/rlm_eap/libeap/eap_tls.h
@@ -61,9 +61,9 @@ USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
  */
 fr_tls_status_t eaptls_process(eap_handler_t *handler);
 
-int 		eaptls_success(eap_handler_t *handler, int peap_flag);
-int 		eaptls_fail(eap_handler_t *handler, int peap_flag);
-int 		eaptls_request(EAP_DS *eap_ds, tls_session_t *ssn);
+int 		eaptls_success(eap_handler_t *handler, int peap_flag) CC_HINT(nonnull);
+int 		eaptls_fail(eap_handler_t *handler, int peap_flag) CC_HINT(nonnull);
+int 		eaptls_request(EAP_DS *eap_ds, tls_session_t *ssn) CC_HINT(nonnull);
 
 
 /* MPPE key generation */

diff --git a/src/modules/rlm_eap/mem.c b/src/modules/rlm_eap/mem.c
@@ -315,7 +315,7 @@ static void eaplist_expire(rlm_eap_t *inst, REQUEST *request, time_t timestamp)
  *	Since we're adding it to the list, we guess that this means
  *	the packet needs a State attribute.  So add one.
  */
-int CC_HINT(nonnull) eaplist_add(rlm_eap_t *inst, eap_handler_t *handler)
+int eaplist_add(rlm_eap_t *inst, eap_handler_t *handler)
 {
 	int		status = 0;
 	VALUE_PAIR	*state;

diff --git a/src/modules/rlm_eap/rlm_eap.h b/src/modules/rlm_eap/rlm_eap.h
@@ -90,24 +90,22 @@ typedef struct rlm_eap {
 
 /* function definitions */
 /* EAP-Type */
-int      	eap_module_load(rlm_eap_t *inst, eap_module_t **method, eap_type_t num,
-				CONF_SECTION *cs);
+int      	eap_module_load(rlm_eap_t *inst, eap_module_t **method, eap_type_t num, CONF_SECTION *cs);
 eap_rcode_t	eap_method_select(rlm_eap_t *inst, eap_handler_t *handler);
 
 /* EAP */
-int  		eap_start(rlm_eap_t *inst, REQUEST *request);
-void 		eap_fail(eap_handler_t *handler);
-void 		eap_success(eap_handler_t *handler);
-rlm_rcode_t 	eap_compose(eap_handler_t *handler);
-eap_handler_t 	*eap_handler(rlm_eap_t *inst, eap_packet_raw_t **eap_msg, REQUEST *request);
+int  		eap_start(rlm_eap_t *inst, REQUEST *request) CC_HINT(nonnull);
+void 		eap_fail(eap_handler_t *handler) CC_HINT(nonnull);
+void 		eap_success(eap_handler_t *handler) CC_HINT(nonnull);
+rlm_rcode_t 	eap_compose(eap_handler_t *handler) CC_HINT(nonnull);
+eap_handler_t 	*eap_handler(rlm_eap_t *inst, eap_packet_raw_t **eap_msg, REQUEST *request) CC_HINT(nonnull);
 
 /* Memory Management */
 EAP_DS      	*eap_ds_alloc(eap_handler_t *handler);
 eap_handler_t 	*eap_handler_alloc(rlm_eap_t *inst);
 void	    	eap_ds_free(EAP_DS **eap_ds);
-int 	    	eaplist_add(rlm_eap_t *inst, eap_handler_t *handler);
-eap_handler_t 	*eaplist_find(rlm_eap_t *inst, REQUEST *request,
-			      eap_packet_raw_t *eap_packet);
+int 	    	eaplist_add(rlm_eap_t *inst, eap_handler_t *handler) CC_HINT(nonnull);
+eap_handler_t 	*eaplist_find(rlm_eap_t *inst, REQUEST *request, eap_packet_raw_t *eap_packet);
 void		eaplist_free(rlm_eap_t *inst);
 
 /* State */

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h b/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h
@@ -67,5 +67,5 @@ typedef struct peap_tunnel_t {
 /*
  *	Process the PEAP portion of an EAP-PEAP request.
  */
-rlm_rcode_t eappeap_process(eap_handler_t *handler, tls_session_t *tls_session);
+rlm_rcode_t eappeap_process(eap_handler_t *handler, tls_session_t *tls_session) CC_HINT(nonnull);
 #endif /* _EAP_PEAP_H */
diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@ -724,7 +724,7 @@ static void print_tunneled_data(uint8_t const *data, size_t data_len)
 /*
  *	Process the pseudo-EAP contents of the tunneled data.
  */
-rlm_rcode_t CC_HINT(nonnull) eappeap_process(eap_handler_t *handler, tls_session_t *tls_session)
+rlm_rcode_t eappeap_process(eap_handler_t *handler, tls_session_t *tls_session)
 {
 	peap_tunnel_t	*t = tls_session->opaque;
 	REQUEST		*fake;

diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/eap_ttls.h b/src/modules/rlm_eap/types/rlm_eap_ttls/eap_ttls.h
@@ -41,6 +41,6 @@ typedef struct ttls_tunnel_t {
 /*
  *	Process the TTLS portion of an EAP-TTLS request.
  */
-PW_CODE eapttls_process(eap_handler_t *handler, tls_session_t *tls_session);
+PW_CODE eapttls_process(eap_handler_t *handler, tls_session_t *tls_session) CC_HINT(nonnull);
 
 #endif /* _EAP_TTLS_H */
diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
@@ -914,7 +914,7 @@ static int CC_HINT(nonnull) eapttls_postproxy(eap_handler_t *handler, void *data
 /*
  *	Process the "diameter" contents of the tunneled data.
  */
-PW_CODE CC_HINT(nonnull) eapttls_process(eap_handler_t *handler, tls_session_t *tls_session)
+PW_CODE eapttls_process(eap_handler_t *handler, tls_session_t *tls_session)
 {
 	PW_CODE code = PW_CODE_AUTHENTICATION_REJECT;
 	rlm_rcode_t rcode;

diff --git a/src/modules/rlm_rest/rest.h b/src/modules/rlm_rest/rest.h
@@ -259,7 +259,7 @@ int rest_request_config(rlm_rest_t *instance,
 			rlm_rest_section_t *section, REQUEST *request,
 			void *handle, http_method_t method,
 			http_body_type_t type, char const *uri,
-			char const *username, char const *password)C C_HINT(nonnull (1,2,3,4,7));
+			char const *username, char const *password) CC_HINT(nonnull (1,2,3,4,7));
 
 int rest_request_perform(rlm_rest_t *instance,
 			 rlm_rest_section_t *section, REQUEST *request,

diff --git a/src/modules/rlm_securid/mem.c b/src/modules/rlm_securid/mem.c
@@ -90,7 +90,7 @@ void securid_sessionlist_free(rlm_securid_t *inst,REQUEST *request)
  *	Since we're adding it to the list, we guess that this means
  *	the packet needs a State attribute.  So add one.
  */
-int CC_HINT(nonnull) securid_sessionlist_add(rlm_securid_t *inst,REQUEST *request, SECURID_SESSION *session)
+int securid_sessionlist_add(rlm_securid_t *inst,REQUEST *request, SECURID_SESSION *session)
 {
 	int		status = 0;
 	VALUE_PAIR	*state;

diff --git a/src/modules/rlm_securid/rlm_securid.h b/src/modules/rlm_securid/rlm_securid.h
@@ -80,12 +80,14 @@ typedef struct rlm_securid_t {
 
 /* Memory Management */
 SECURID_SESSION*     securid_session_alloc(void);
-void		     securid_session_free(rlm_securid_t *inst, REQUEST *request,SECURID_SESSION *session);
+void		     securid_session_free(rlm_securid_t *inst, REQUEST *request,SECURID_SESSION *session)
+		     CC_HINT(nonnull);
 
-void		     securid_sessionlist_free(rlm_securid_t *inst,REQUEST *request);
+void		     securid_sessionlist_free(rlm_securid_t *inst,REQUEST *request) CC_HINT(nonnull);
 
-int		     securid_sessionlist_add(rlm_securid_t *inst, REQUEST *request, SECURID_SESSION *session);
-SECURID_SESSION*     securid_sessionlist_find(rlm_securid_t *inst, REQUEST *request);
+int		     securid_sessionlist_add(rlm_securid_t *inst, REQUEST *request, SECURID_SESSION *session)
+		     CC_HINT(nonnull);
+SECURID_SESSION	     *securid_sessionlist_find(rlm_securid_t *inst, REQUEST *request) CC_HINT(nonnull);
 
 
 #endif