From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Wed, 10 Nov 2010 18:15:47 +0000 (+0000)
Subject: Fix warnings/errors in strict compilers on vararg functions.
X-Git-Tag: 2.4.2~31
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=bf3b7b6f2759587387fd7a170f953ee2af5197b3;hp=dc8a21d9c4dfdf0b6d3ed1389ae6a9d772a2bc16;p=shibboleth%2Fsp.git

Fix warnings/errors in strict compilers on vararg functions.


git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/branches/REL_2@3371 cb58f699-b61c-0410-a6fe-9272a202ed29
---

diff --git a/apache/mod_apache.cpp b/apache/mod_apache.cpp
index c6a6279..1dbf440 100644
--- a/apache/mod_apache.cpp
+++ b/apache/mod_apache.cpp
@@ -401,6 +401,7 @@ public:
         (level == SPWarn ? APLOG_WARNING :
         (level == SPError ? APLOG_ERR : APLOG_CRIT))))|APLOG_NOERRNO,
         SH_AP_R(m_req),
+        "%s",
         msg.c_str()
         );
   }
@@ -553,7 +554,7 @@ public:
     return string(SH_AP_AUTH_TYPE(m_req) ? SH_AP_AUTH_TYPE(m_req) : "");
   }
   void setContentType(const char* type) {
-      m_req->content_type = ap_psprintf(m_req->pool, type);
+      m_req->content_type = ap_psprintf(m_req->pool, "%s", type);
   }
   void setResponseHeader(const char* name, const char* value) {
    HTTPResponse::setResponseHeader(name, value);
@@ -1312,7 +1313,7 @@ AccessControl::aclresult_t htAccessControl::authorized(const SPRequest& request,
 // Initial look at a request - create the per-request structure
 static int shib_post_read(request_rec *r)
 {
-    shib_request_config* rc = init_request_config(r);
+    init_request_config(r);
     //ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(r), "shib_post_read");
     return DECLINED;
 }
@@ -1408,7 +1409,7 @@ extern "C" void shib_child_init(apr_pool_t* p, server_rec* s)
             throw runtime_error("unknown error");
     }
     catch (exception& ex) {
-        ap_log_error(APLOG_MARK,APLOG_CRIT|APLOG_NOERRNO,SH_AP_R(s),ex.what());
+        ap_log_error(APLOG_MARK,APLOG_CRIT|APLOG_NOERRNO,SH_AP_R(s),"%s",ex.what());
         ap_log_error(APLOG_MARK,APLOG_CRIT|APLOG_NOERRNO,SH_AP_R(s),"shib_child_init() failed to load configuration");
         exit(1);
     }