we have too many functions

diff --git a/rr.c b/rr.c
index 8a02b28d0d3e1df2910664d0bc3302d2e027966e..2bcd0ae6f299e1b2a7ea68e2156568412a0ad928 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -150,7 +150,7 @@ ldns_rr_new_frm_str(const char *str)
                FREE(rd_buf);
                return NULL;
        }
-       ttl_val = strtottl(ttl, &endptr); /* i'm not using endptr */
+       ttl_val = ldns_str2period(ttl, &endptr); /* i'm not using endptr */
        if (ttl_val == 0) {
                /* ah, it's not there or something */
                ttl_val = LDNS_DEFTTL;

diff --git a/run-test18.c b/run-test18.c
index f8b110bc46649f978713507eb83fb18a39c6d598..970f696a9185996cf079ae30383c77a9e0d6c2ca 100644 (file)
--- a/run-test18.c
+++ b/run-test18.c
@@ -74,13 +74,10 @@ main()
        ldns_rr_print(stdout, rr);
        printf("\n");
 
-#if 0
        rr = ldns_rr_new_frm_str("a.miek.nl.   1800   IN   A    195.169.222.38");
        ldns_rr_print(stdout, rr);
        printf("\n");
-#endif 
 
-       exit(0);
 
        privkey = ldns_key_new_frm_algorithm(LDNS_SIGN_RSASHA1, 512);
        if (!privkey) {

diff --git a/util.c b/util.c
index 9e083f602ab682a74fef16235f8cc0baa2126170..b159277934a8b0bf42cab1a3afa6ad2c9249d4b8 100644 (file)
--- a/util.c
+++ b/util.c
@@ -151,77 +151,3 @@ int_to_hexdigit(int i)
                abort();
        }
 }
-
-
-uint32_t
-strtottl(const char *nptr, const char **endptr)
-{
-        int sign = 0;
-        uint32_t i = 0;
-        uint32_t seconds = 0;
-
-        for(*endptr = nptr; **endptr; (*endptr)++) {
-                switch (**endptr) {
-                case ' ':
-                case '\t':
-                        break;
-                case '-':
-                        if(sign == 0) {
-                                sign = -1;
-                        } else {
-                                return (sign == -1) ? -seconds : seconds;
-                        }
-                        break;
-                case '+':
-                        if(sign == 0) {
-                                sign = 1;
-                        } else {
-                                return (sign == -1) ? -seconds : seconds;
-                        }
-                        break;
-                case 's':
-                case 'S':
-                        seconds += i;
-                        i = 0;
-                        break;
-                case 'm':
-                case 'M':
-                        seconds += i * 60;
-                        i = 0;
-                        break;
-                case 'h':
-                case 'H':
-                        seconds += i * 60 * 60;
-                        i = 0;
-                        break;
-                case 'd':
-                case 'D':
-                        seconds += i * 60 * 60 * 24;
-                        i = 0;
-                        break;
-                case 'w':
-                case 'W':
-                        seconds += i * 60 * 60 * 24 * 7;
-                        i = 0;
-                        break;
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                case '8':
-                case '9':
-                        i *= 10;
-                        i += (**endptr - '0');
-                        break;
-                default:
-                        seconds += i;
-                        return (sign == -1) ? -seconds : seconds;
-                }
-        }
-        seconds += i;
-        return (sign == -1) ? -seconds : seconds;
-}

diff --git a/util.h b/util.h
index 56d1fcde3f79772da9c90c7e5204f393e0666003..43c6412c40db4d827ea59ae064e12d8124ea45ab 100644 (file)
--- a/util.h
+++ b/util.h
@@ -162,9 +162,4 @@ int hexdigit_to_int(char ch);
  */
 char int_to_hexdigit(int ch);
 
-/**
- * convert TTL string (1d2h, etc.) to a long. 0 on failure? 
- */
-uint32_t strtottl(const char *nptr, const char **endptr);
-
 #endif /* !_UTIL_H */