From 7c33d499c369ee4ef3d867425bfe14fdef3e850d Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Mon, 21 Jul 2008 02:09:28 +0200
Subject: [PATCH] Removed various unnecessary includes of <ctype.h> and
replaced yey another toupper() with its i_* equivalent.
---
src/lib-sieve/plugins/regex/ext-regex.c | 1 -
src/lib-sieve/plugins/regex/mcht-regex.c | 2 +-
src/lib-sieve/plugins/variables/cmd-set.c | 2 --
src/lib-sieve/plugins/variables/ext-variables-common.c | 2 --
src/lib-sieve/plugins/variables/ext-variables-modifiers.c | 2 +-
src/lib-sieve/plugins/variables/ext-variables-name.c | 2 +-
src/lib-sieve/plugins/variables/ext-variables-name.h | 2 --
src/lib-sieve/plugins/variables/ext-variables.c | 2 --
src/lib-sieve/sieve-actions.c | 2 --
9 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/lib-sieve/plugins/regex/ext-regex.c b/src/lib-sieve/plugins/regex/ext-regex.c
index 0eac65508..0117b15c9 100644
--- a/src/lib-sieve/plugins/regex/ext-regex.c
+++ b/src/lib-sieve/plugins/regex/ext-regex.c
@@ -34,7 +34,6 @@
#include "ext-regex-common.h"
#include <sys/types.h>
-#include <ctype.h>
#include <regex.h>
/* Forward declarations */
diff --git a/src/lib-sieve/plugins/regex/mcht-regex.c b/src/lib-sieve/plugins/regex/mcht-regex.c
index 620d8bfae..8091a9f49 100644
--- a/src/lib-sieve/plugins/regex/mcht-regex.c
+++ b/src/lib-sieve/plugins/regex/mcht-regex.c
@@ -17,8 +17,8 @@
#include "ext-regex-common.h"
#include <sys/types.h>
-#include <ctype.h>
#include <regex.h>
+#include <ctype.h>
/*
* Configuration
diff --git a/src/lib-sieve/plugins/variables/cmd-set.c b/src/lib-sieve/plugins/variables/cmd-set.c
index 8c034e236..a94d0ed03 100644
--- a/src/lib-sieve/plugins/variables/cmd-set.c
+++ b/src/lib-sieve/plugins/variables/cmd-set.c
@@ -18,8 +18,6 @@
#include "ext-variables-common.h"
#include "ext-variables-modifiers.h"
-#include <ctype.h>
-
/* Forward declarations */
static bool cmd_set_operation_dump
diff --git a/src/lib-sieve/plugins/variables/ext-variables-common.c b/src/lib-sieve/plugins/variables/ext-variables-common.c
index 6b1eda888..fe3db98fa 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-common.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-common.c
@@ -21,8 +21,6 @@
#include "ext-variables-name.h"
#include "ext-variables-modifiers.h"
-#include <ctype.h>
-
/* Forward declarations */
extern const struct ext_variables_set_modifier lower_modifier;
diff --git a/src/lib-sieve/plugins/variables/ext-variables-modifiers.c b/src/lib-sieve/plugins/variables/ext-variables-modifiers.c
index f6ec1ae3d..05201732c 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-modifiers.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-modifiers.c
@@ -154,7 +154,7 @@ bool mod_upperfirst_modify(string_t *in, string_t **result)
str_append_str(*result, in);
content = str_c_modifiable(*result);
- content[0] = toupper(content[0]);
+ content[0] = i_toupper(content[0]);
return TRUE;
}
diff --git a/src/lib-sieve/plugins/variables/ext-variables-name.c b/src/lib-sieve/plugins/variables/ext-variables-name.c
index ac9f00920..2dbbbe1c5 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-name.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-name.c
@@ -8,7 +8,7 @@
#include "ext-variables-name.h"
#include <ctype.h>
-
+
int ext_variable_name_parse
(ARRAY_TYPE(ext_variable_name) *vname, const char **str, const char *strend)
{
diff --git a/src/lib-sieve/plugins/variables/ext-variables-name.h b/src/lib-sieve/plugins/variables/ext-variables-name.h
index efc00a54a..7102b56cb 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-name.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-name.h
@@ -32,8 +32,6 @@
#include "sieve-common.h"
#include "ext-variables-common.h"
-
-#include <ctype.h>
struct ext_variable_name {
string_t *identifier;
diff --git a/src/lib-sieve/plugins/variables/ext-variables.c b/src/lib-sieve/plugins/variables/ext-variables.c
index a003669c2..b831c7936 100644
--- a/src/lib-sieve/plugins/variables/ext-variables.c
+++ b/src/lib-sieve/plugins/variables/ext-variables.c
@@ -30,8 +30,6 @@
#include "ext-variables-operands.h"
#include "ext-variables-modifiers.h"
-#include <ctype.h>
-
/* Forward declarations */
static bool ext_variables_load(int ext_id);
diff --git a/src/lib-sieve/sieve-actions.c b/src/lib-sieve/sieve-actions.c
index 8b671957a..594278fc1 100644
--- a/src/lib-sieve/sieve-actions.c
+++ b/src/lib-sieve/sieve-actions.c
@@ -12,8 +12,6 @@
#include "sieve-result.h"
#include "sieve-actions.h"
-#include <ctype.h>
-
/*
* Message transmission (FIXME: place this somewhere more appropriate)
*/
--
GitLab