From: Stefan Fritsch <sf@apache.org>
Date: Sat, 4 Jun 2011 19:00:16 +0000 (+0000)
Subject: Add __attribute__((sentinel)) to a few functions that require a terminal NULL
X-Git-Tag: 2.3.13~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=328e833e414bce72b094f38df84296ae783da3a0;p=thirdparty%2Fapache%2Fhttpd.git

Add __attribute__((sentinel)) to a few functions that require a terminal NULL
argument.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1131467 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/include/http_protocol.h b/include/http_protocol.h
index 996e606ef86..705268efe33 100644
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -345,7 +345,8 @@ static inline int ap_rputs(const char *str, request_rec *r)
  * @param ... The strings to write
  * @return The number of bytes sent
  */
-AP_DECLARE_NONSTD(int) ap_rvputs(request_rec *r,...);
+AP_DECLARE_NONSTD(int) ap_rvputs(request_rec *r,...)
+                       __attribute__((sentinel));
 
 /**
  * Output data to the client in a printf format
diff --git a/include/http_request.h b/include/http_request.h
index 43dd7c8c0bf..e591f6ea2c9 100644
--- a/include/http_request.h
+++ b/include/http_request.h
@@ -284,7 +284,8 @@ AP_DECLARE(void) ap_update_mtime(request_rec *r, apr_time_t dependency_mtime);
  *                method name to add.
  * @return  None.
  */
-AP_DECLARE(void) ap_allow_methods(request_rec *r, int reset, ...);
+AP_DECLARE(void) ap_allow_methods(request_rec *r, int reset, ...)
+                 __attribute__((sentinel));
 
 /**
  * Add one or more methods to the list permitted to access the resource.
diff --git a/include/util_cookies.h b/include/util_cookies.h
index b46c9bc0dea..439d28926d6 100644
--- a/include/util_cookies.h
+++ b/include/util_cookies.h
@@ -65,8 +65,10 @@ typedef struct {
  * @param ... A varargs array of zero or more (apr_table_t *) tables followed by NULL
  *            to which the cookies should be added.
  */
-AP_DECLARE(apr_status_t) ap_cookie_write(request_rec * r, const char *name, const char *val,
-                                         const char *attrs, long maxage, ...);
+AP_DECLARE(apr_status_t) ap_cookie_write(request_rec * r, const char *name,
+                                         const char *val, const char *attrs,
+                                         long maxage, ...)
+                         __attribute__((sentinel));
 
 /**
  * Write an RFC2965 compliant cookie.
@@ -80,8 +82,10 @@ AP_DECLARE(apr_status_t) ap_cookie_write(request_rec * r, const char *name, cons
  * @param ... A varargs array of zero or more (apr_table_t *) tables followed by NULL
  *            to which the cookies should be added.
  */
-AP_DECLARE(apr_status_t) ap_cookie_write2(request_rec * r, const char *name2, const char *val,
-                                          const char *attrs2, long maxage, ...);
+AP_DECLARE(apr_status_t) ap_cookie_write2(request_rec * r, const char *name2,
+                                          const char *val, const char *attrs2,
+                                          long maxage, ...)
+                         __attribute__((sentinel));
 
 /**
  * Remove an RFC2109 compliant cookie.
@@ -93,7 +97,9 @@ AP_DECLARE(apr_status_t) ap_cookie_write2(request_rec * r, const char *name2, co
  * @param ... A varargs array of zero or more (apr_table_t *) tables followed by NULL
  *            to which the cookies should be added.
  */
-AP_DECLARE(apr_status_t) ap_cookie_remove(request_rec * r, const char *name, const char *attrs, ...);
+AP_DECLARE(apr_status_t) ap_cookie_remove(request_rec * r, const char *name,
+                                          const char *attrs, ...)
+                         __attribute__((sentinel));
 
 /**
  * Remove an RFC2965 compliant cookie.
@@ -105,7 +111,9 @@ AP_DECLARE(apr_status_t) ap_cookie_remove(request_rec * r, const char *name, con
  * @param ... A varargs array of zero or more (apr_table_t *) tables followed by NULL
  *            to which the cookies should be added.
  */
-AP_DECLARE(apr_status_t) ap_cookie_remove2(request_rec * r, const char *name2, const char *attrs2, ...);
+AP_DECLARE(apr_status_t) ap_cookie_remove2(request_rec * r, const char *name2,
+                                           const char *attrs2, ...)
+                         __attribute__((sentinel));
 
 /**
  * Read a cookie called name, placing its value in val.
diff --git a/include/util_script.h b/include/util_script.h
index 3119e8be891..04511c9768c 100644
--- a/include/util_script.h
+++ b/include/util_script.h
@@ -122,7 +122,8 @@ AP_DECLARE(int) ap_scan_script_header_err_brigade(request_rec *r,
 AP_DECLARE_NONSTD(int) ap_scan_script_header_err_strs(request_rec *r, 
                                                       char *buffer, 
                                                       const char **termch,
-                                                      int *termarg, ...);
+                                                      int *termarg, ...)
+                       __attribute__((sentinel));
 
 /**
  * Read headers output from a script, ensuring that the output is valid.  If