Land https://codereview.chromium.org/889083003/ to update libsrtp to upstream 1.5.0

srtp/crypto/include/err.h

 /*
  * err.h
  * 
  * error status codes
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
 /*
  *      
@@ skipping 28 matching lines @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 
 #ifndef ERR_H
 #define ERR_H
 
-#include "datatypes.h"
+#include <stdio.h>
+#include <stdarg.h>
 
 /**
  * @defgroup Error Error Codes
  * 
  * Error status codes are represented by the enumeration err_status_t.
  * 
  * @{
  */
 
 
@@ skipping 20 matching lines @@
   err_status_algo_fail    = 11, /**< algorithm failed test routine           */
   err_status_no_such_op   = 12, /**< unsupported operation                   */
   err_status_no_ctx       = 13, /**< no appropriate context found            */
   err_status_cant_check   = 14, /**< unable to perform desired validation    */
   err_status_key_expired  = 15, /**< can't use key any more                  */
   err_status_socket_err   = 16, /**< error in use of socket                  */
   err_status_signal_err   = 17, /**< error in use POSIX signals              */
   err_status_nonce_bad    = 18, /**< nonce check failed                      */
   err_status_read_fail    = 19, /**< couldn't read data                      */
   err_status_write_fail   = 20, /**< couldn't write data                     */
-  err_status_parse_err    = 21, /**< error pasring data                      */
+  err_status_parse_err    = 21, /**< error parsing data                      */
   err_status_encode_err   = 22, /**< error encoding data                     */
   err_status_semaphore_err = 23,/**< error while using semaphores            */
   err_status_pfkey_err    = 24  /**< error while using pfkey                 */
 } err_status_t;
 
 /**
  * @}
  */
 
 typedef enum {
@@ skipping 10 matching lines @@
 
 /*
  * err_reporting_init prepares the error system.  If
  * ERR_REPORTING_SYSLOG is defined, it will open syslog.
  *
  * The ident argument is a string that will be prepended to
  * all syslog messages.  It is conventionally argv[0].
  */
 
 err_status_t
-err_reporting_init(char *ident);
+err_reporting_init(const char *ident);
 
 #ifdef SRTP_KERNEL_LINUX
 extern err_reporting_level_t err_level;
 #else
 
 /*
  * keydaemon_report_error reports a 'printf' formatted error
  * string, followed by a an arg list.  The priority argument
  * is equivalent to that defined for syslog.
  *
  * Errors will be reported to ERR_REPORTING_FILE, if defined, and to
  * syslog, if ERR_REPORTING_SYSLOG is defined.
  *
  */
 
 void
-err_report(int priority, char *format, ...);
+err_report(int priority, const char *format, ...);
 #endif /* ! SRTP_KERNEL_LINUX */
 
 
 /*
  * debug_module_t defines a debug module
  */
 
 typedef struct {
   int   on;          /* 1 if debugging is on, 0 if it is off */
-  char *name;        /* printable name for debug module      */
+  const char *name;  /* printable name for debug module      */
 } debug_module_t;
 
 #ifdef ENABLE_DEBUGGING
 
 #define debug_on(mod)  (mod).on = 1
 
 #define debug_off(mod) (mod).on = 0
 
 /* use err_report() to report debug message */
 #define debug_print(mod, format, arg)                  \
   if (mod.on) err_report(err_level_debug, ("%s: " format "\n"), mod.name, arg)
 #define debug_print2(mod, format, arg1,arg2)                  \
   if (mod.on) err_report(err_level_debug, ("%s: " format "\n"), mod.name, arg1,arg2)
 
 #else
 
 /* define macros to do nothing */
 #define debug_print(mod, format, arg)
 
 #define debug_on(mod)
 
 #define debug_off(mod)
 
 #endif
 
 #endif /* ERR_H */