From 6beca48c543e11dfc8e1885183a0900cd782a741 Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Mon, 27 Jul 2015 00:41:56 -0300 Subject: [PATCH] Fix C api signatures --- headers/modsecurity/rules.h | 6 +++--- src/rules.cc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/headers/modsecurity/rules.h b/headers/modsecurity/rules.h index 51c7263f..68d74ea6 100644 --- a/headers/modsecurity/rules.h +++ b/headers/modsecurity/rules.h @@ -58,7 +58,7 @@ class Rules : public RulesProperties { void decrementReferenceCount(void); bool loadFromUri(const char *uri); - bool loadRemote(char *key, char *uri); + bool loadRemote(const char *key, const char *uri); bool load(const char *rules); bool load(const char *rules, const std::string &ref); @@ -89,9 +89,9 @@ extern "C" { Rules *msc_create_rules_set(); void msc_rules_dump(Rules *rules); int msc_rules_merge(Rules *rules_dst, Rules *rules_from); -int msc_rules_add_remote(Rules *rules, char *key, char *uri, +int msc_rules_add_remote(Rules *rules, const char *key, const char *uri, const char **error); -int msc_rules_add_file(Rules *rules, char *file, const char **error); +int msc_rules_add_file(Rules *rules, const char *file, const char **error); int msc_rules_add(Rules *rules, const char *plain_rules, const char **error); int msc_rules_cleanup(Rules *rules); diff --git a/src/rules.cc b/src/rules.cc index 1e11e8b4..173cd81f 100644 --- a/src/rules.cc +++ b/src/rules.cc @@ -137,7 +137,7 @@ bool Rules::load(const char *file, const std::string &ref) { } -bool Rules::loadRemote(char *key, char *uri) { +bool Rules::loadRemote(const char *key, const char *uri) { HttpsClient client; bool ret = client.download(uri); @@ -298,7 +298,7 @@ extern "C" int msc_rules_merge(Rules *rules_dst, extern "C" int msc_rules_add_remote(Rules *rules, - char *key, char *uri, const char **error) { + const char *key, const char *uri, const char **error) { int ret = rules->loadRemote(key, uri); if (ret == 0) { *error = rules->getParserError().c_str(); @@ -307,7 +307,7 @@ extern "C" int msc_rules_add_remote(Rules *rules, } -extern "C" int msc_rules_add_file(Rules *rules, char *file, +extern "C" int msc_rules_add_file(Rules *rules, const char *file, const char **error) { int ret = rules->loadFromUri(file); if (ret == 0) {