cleanup: replace itoa with snprintf(...%d...)

diff --git a/include/itoa.h b/include/itoa.h
deleted file mode 100644 (file)
index eafcca1..0000000
--- a/include/itoa.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 2002, 2003 Mads Martin Joergensen <mmj at mmj.dk>
- *
- * $Id$
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#ifndef _ITOA_H_
-#define _ITOA_H_
-
-void reversestr(char *str);
-void itoa(int n, char *str);
-
-#endif /* _ITOA_H_ */
-

diff --git a/src/Makefile.am b/src/Makefile.am
index 12a5953a357010f66e164f79b5b74c95baba725a..b068c2f5084145c1dc411fb53d872e4102992564 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ bin_SCRIPTS = mlmmj-make-ml
 
 EXTRA_DIST = mlmmj-make-ml
 
-mlmmj_send_SOURCES = mlmmj.c mlmmj-send.c  mail-functions.c itoa.c chomp.c \
+mlmmj_send_SOURCES = mlmmj.c mlmmj-send.c  mail-functions.c chomp.c \
                      incindexfile.c checkwait_smtpreply.c  utils.c \
                     init_sockfd.c strgen.c random-int.c \
                     print-version.c log_error.c mygetline.c memory.c \
@@ -22,7 +22,7 @@ mlmmj_receive_SOURCES = mlmmj-receive.c  random-int.c strgen.c \
                        log_oper.c readn.c
 
 mlmmj_process_SOURCES = mlmmj.c mlmmj-process.c  find_email_adr.c \
-                       incindexfile.c itoa.c  chomp.c utils.c \
+                       incindexfile.c chomp.c utils.c \
                        listcontrol.c random-int.c strgen.c \
                        print-version.c send_help.c prepstdreply.c \
                        do_all_the_voodoo_here.c mygetline.c gethdrline.c \

diff --git a/src/incindexfile.c b/src/incindexfile.c
index 6ce28b0d997707cffcb7eb658890d193fb38118a..bb94a7ea28c4e9f21cac6fe44283fbc42d86fc8c 100644 (file)
--- a/src/incindexfile.c
+++ b/src/incindexfile.c
@@ -35,7 +35,6 @@
 
 #include "wrappers.h"
 #include "incindexfile.h"
-#include "itoa.h"
 #include "log_error.h"
 #include "strgen.h"
 #include "memory.h"

diff --git a/src/itoa.c b/src/itoa.c
deleted file mode 100644 (file)
index 52af692..0000000
--- a/src/itoa.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright (C) 2002, 2003 Mads Martin Joergensen <mmj at mmj.dk>
- *
- * $Id$
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#include <string.h>
-#include "itoa.h"
-
-void reversestr(char *str)
-{
-       char c;
-       int i, j;
-
-       for(i = 0, j = strlen(str) - 1; i < j; i++, j--) {
-               c = str[i];
-               str[i] = str[j];
-               str[j] = c;
-       }
-}
-
-void itoa(int n, char *str)
-{
-       int i, sign;
-
-       if((sign = n) < 0)
-               n = -n;
-       i = 0;
-       do {
-               str[i++] = n % 10 + '0';
-       } while((n /= 10) > 0);
-       if(sign < 0)
-               str[i++] = '-';
-       str[i] = 0;
-       reversestr(str);
-}

diff --git a/src/mlmmj-send.c b/src/mlmmj-send.c
index 2ed84112a52e807cc276eab0a5a5f0cc7997721c..97acf3b1a4adb9f4a522bdc0ba7e9bb67a78d825 100644 (file)
--- a/src/mlmmj-send.c
+++ b/src/mlmmj-send.c
@@ -46,7 +46,6 @@
 #include "mlmmj.h"
 #include "mlmmj-send.h"
 #include "mail-functions.h"
-#include "itoa.h"
 #include "incindexfile.h"
 #include "chomp.h"
 #include "checkwait_smtpreply.h"
@@ -717,7 +716,7 @@ int main(int argc, char **argv)
                         mindex);
        }
 
-       itoa(mindex, strindex);
+       snprintf(strindex, sizeof(strindex), "%d", mindex);
 
        if(!relayhost) {
                relayhost = ctrlvalue(&list, "relayhost");