Split avahi-common/util.h into

	avahi-common/domain.h
	avahi-core/fdutil.h
	avahi-core/timeval.h


git-svn-id: file:///home/lennart/svn/public/avahi/trunk@299 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

7 files changed, 11 insertions, 251 deletions

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 3b025be..20eaee3 100644
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -32,7 +32,7 @@ avahi_commoninclude_HEADERS = \
 	strlst.h \
 	address.h \
 	alternative.h \
-	util.h \
+	domain.h \
 	cdecl.h \
 	defs.h \
 	malloc.h
@@ -46,8 +46,7 @@ noinst_HEADERS = llist.h
 noinst_PROGRAMS = \
 	strlst-test \
 	domain-test \
-	alternative-test \
-	timeval-test
+	alternative-test
 
 lib_LTLIBRARIES = \
 	libavahi-common.la 
@@ -58,7 +57,7 @@ libavahi_common_la_SOURCES = \
 	alternative.c alternative.h \
 	error.c error.h \
 	strlst.c strlst.h \
-	util.c util.h
+	domain.c domain.h
 libavahi_common_la_CFLAGS = $(AM_CFLAGS)
 libavahi_common_la_LIBADD = $(AM_LDADD)
 
@@ -72,22 +71,15 @@ strlst_test_LDADD = $(AM_LDADD)
 alternative_test_SOURCES = \
 	alternative.c alternative.h \
 	malloc.c malloc.h \
-	util.c util.h \
+	domain.c domain.h \
 	alternative-test.c
 alternative_test_CFLAGS = $(AM_CFLAGS)
 alternative_test_LDADD = $(AM_LDADD)
 
 domain_test_SOURCES = \
-	util.c util.h \
+	domain.c domain.h \
 	malloc.c malloc.h \
 	domain-test.c
 domain_test_CFLAGS = $(AM_CFLAGS)
 domain_test_LDADD = $(AM_LDADD)
 
-timeval_test_SOURCES = \
-	util.c util.h \
-	malloc.c malloc.h \
-	timeval-test.c
-timeval_test_CFLAGS = $(AM_CFLAGS)
-timeval_test_LDADD = $(AM_LDADD)
-
diff --git a/avahi-common/address.c b/avahi-common/address.c
index c638b41..50224ed 100644
--- a/avahi-common/address.c
+++ b/avahi-common/address.c
@@ -30,7 +30,6 @@
 #include <assert.h>
 
 #include "address.h"
-#include "util.h"
 #include "malloc.h"
 
 size_t avahi_address_get_size(const AvahiAddress *a) {
diff --git a/avahi-common/alternative.c b/avahi-common/alternative.c
index 53a1e6c..436a0d4 100644
--- a/avahi-common/alternative.c
+++ b/avahi-common/alternative.c
@@ -30,7 +30,6 @@
 
 #include "alternative.h"
 #include "malloc.h"
-#include "util.h"
 
 char * avahi_alternative_host_name(const char *s) {
     const char *p, *e;
diff --git a/avahi-common/domain-test.c b/avahi-common/domain-test.c
index a9ad0b6..0113a8b 100644
--- a/avahi-common/domain-test.c
+++ b/avahi-common/domain-test.c
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 
-#include "util.h"
+#include "domain.h"
 #include "malloc.h"
 
 int main(int argc, char *argv[]) {
diff --git a/avahi-common/util.c b/avahi-common/domain.c
index cc80fe5..b1e7cfe 100644
--- a/avahi-common/util.c
+++ b/avahi-common/domain.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "util.h"
+#include "domain.h"
 #include "malloc.h"
 
 char *avahi_get_host_name(void) {
@@ -95,119 +95,6 @@ char *avahi_normalize_name(const char *s) {
     return avahi_strdup(tmp);
 }
 
-int avahi_timeval_compare(const struct timeval *a, const struct timeval *b) {
-    assert(a);
-    assert(b);
-
-    if (a->tv_sec < b->tv_sec)
-        return -1;
-
-    if (a->tv_sec > b->tv_sec)
-        return 1;
-
-    if (a->tv_usec < b->tv_usec)
-        return -1;
-
-    if (a->tv_usec > b->tv_usec)
-        return 1;
-
-    return 0;
-}
-
-AvahiUsec avahi_timeval_diff(const struct timeval *a, const struct timeval *b) {
-    assert(a);
-    assert(b);
-
-    if (avahi_timeval_compare(a, b) < 0)
-        return - avahi_timeval_diff(b, a);
-
-    return ((AvahiUsec) a->tv_sec - b->tv_sec)*1000000 + a->tv_usec - b->tv_usec;
-}
-
-struct timeval* avahi_timeval_add(struct timeval *a, AvahiUsec usec) {
-    AvahiUsec u;
-    assert(a);
-
-    u = usec + a->tv_usec;
-
-    if (u < 0) {
-        a->tv_usec = (long) (1000000 + (u % 1000000));
-        a->tv_sec += (long) (-1 + (u / 1000000));
-    } else {
-        a->tv_usec = (long) (u % 1000000);
-        a->tv_sec += (long) (u / 1000000);
-    }
-
-    return a;
-}
-
-AvahiUsec avahi_age(const struct timeval *a) {
-    struct timeval now;
-    
-    assert(a);
-
-    gettimeofday(&now, NULL);
-
-    return avahi_timeval_diff(&now, a);
-}
-
-
-struct timeval *avahi_elapse_time(struct timeval *tv, unsigned msec, unsigned jitter) {
-    assert(tv);
-
-    gettimeofday(tv, NULL);
-
-    if (msec)
-        avahi_timeval_add(tv, (AvahiUsec) msec*1000);
-
-    if (jitter)
-        avahi_timeval_add(tv, (AvahiUsec) (jitter*1000.0*rand()/(RAND_MAX+1.0)));
-        
-    return tv;
-}
-
-int avahi_set_cloexec(int fd) {
-    int n;
-
-    assert(fd >= 0);
-    
-    if ((n = fcntl(fd, F_GETFD)) < 0)
-        return -1;
-
-    if (n & FD_CLOEXEC)
-        return 0;
-
-    return fcntl(fd, F_SETFD, n|FD_CLOEXEC);
-}
-
-int avahi_set_nonblock(int fd) {
-    int n;
-    
-    assert(fd >= 0);
-
-    if ((n = fcntl(fd, F_GETFL)) < 0)
-        return -1;
-
-    if (n & O_NONBLOCK)
-        return 0;
-
-    return fcntl(fd, F_SETFL, n|O_NONBLOCK);
-}
-
-int avahi_wait_for_write(int fd) {
-    fd_set fds;
-    int r;
-    
-    FD_ZERO(&fds);
-    FD_SET(fd, &fds);
-    
-    if ((r = select(fd+1, NULL, &fds, NULL, NULL)) < 0)
-        return -1;
-    
-    assert(r > 0);
-
-    return 0;
-}
 
 /* Read the first label from string *name, unescape "\" and write it to dest */
 char *avahi_unescape_label(const char **name, char *dest, size_t size) {
@@ -340,40 +227,6 @@ int avahi_binary_domain_cmp(const char *a, const char *b) {
     }
 }
 
-void avahi_hexdump(const void* p, size_t size) {
-    const uint8_t *c = p;
-    assert(p);
-
-    printf("Dumping %u bytes from %p:\n", size, p);
-    
-    while (size > 0) {
-        unsigned i;
-
-        for (i = 0; i < 16; i++) { 
-            if (i < size)
-                printf("%02x ", c[i]);
-            else
-                printf("   ");
-        }
-
-        for (i = 0; i < 16; i++) {
-            if (i < size)
-                printf("%c", c[i] >= 32 && c[i] < 127 ? c[i] : '.');
-            else
-                printf(" ");
-        }
-        
-        printf("\n");
-
-        c += 16;
-
-        if (size <= 16)
-            break;
-        
-        size -= 16;
-    }
-}
-
 unsigned avahi_strhash(const char *p) {
     unsigned hash = 0;
 
@@ -399,30 +252,6 @@ unsigned avahi_domain_hash(const char *s) {
     }
 }
 
-char *avahi_format_mac_address(const uint8_t* mac, size_t size) {
-    char *r, *t;
-    unsigned i;
-    static const char hex[] = "0123456789abcdef";
-
-    t = r = avahi_new(char, size > 0 ? size*3 : 1);
-
-    if (size <= 0) {
-        *r = 0;
-        return r;
-    }
-    
-    for (i = 0; i < size; i++) {
-        *(t++) = hex[*mac >> 4];
-        *(t++) = hex[*mac & 0xF];
-        *(t++) = ':';
-
-        mac++;
-    }
-
-    *(--t) = 0;
-    return r;
-}
-
 int avahi_valid_service_type(const char *t) {
     const char *p;
     assert(t);
diff --git a/avahi-common/util.h b/avahi-common/domain.h
index 65252e3..4a94be1 100644
--- a/avahi-common/util.h
+++ b/avahi-common/domain.h
@@ -1,5 +1,5 @@
-#ifndef fooutilhfoo
-#define fooutilhfoo
+#ifndef foodomainhfoo
+#define foodimainhfoo
 
 /* $Id$ */
 
@@ -23,34 +23,18 @@
 ***/
 
 #include <inttypes.h>
-#include <stdarg.h>
-#include <sys/time.h>
+#include <sys/types.h>
 
 #include <avahi-common/cdecl.h>
 
 AVAHI_C_DECL_BEGIN
 
-typedef int64_t AvahiUsec;
-
 char *avahi_normalize_name(const char *s); /* avahi_free() the result! */
 char *avahi_get_host_name(void); /* avahi_free() the result! */
 
-int avahi_timeval_compare(const struct timeval *a, const struct timeval *b);
-AvahiUsec avahi_timeval_diff(const struct timeval *a, const struct timeval *b);
-struct timeval* avahi_timeval_add(struct timeval *a, AvahiUsec usec);
-
-AvahiUsec avahi_age(const struct timeval *a);
-struct timeval *avahi_elapse_time(struct timeval *tv, unsigned msec, unsigned jitter);
-
-int avahi_set_cloexec(int fd);
-int avahi_set_nonblock(int fd);
-int avahi_wait_for_write(int fd);
-
 int avahi_domain_equal(const char *a, const char *b);
 int avahi_binary_domain_cmp(const char *a, const char *b);
 
-void avahi_hexdump(const void *p, size_t size);
-
 /* Read the first label from the textual domain name *name, unescape
  * it and write it to dest, *name is changed to point to the next label*/
 char *avahi_unescape_label(const char **name, char *dest, size_t size);
@@ -61,15 +45,13 @@ char *avahi_escape_label(const uint8_t* src, size_t src_length, char **ret_name,
 unsigned avahi_strhash(const char *p);
 unsigned avahi_domain_hash(const char *s);
 
-char *avahi_format_mac_address(const uint8_t* mac, size_t size);
-
 int avahi_valid_service_type(const char *t);
 int avahi_valid_domain_name(const char *t);
 int avahi_valid_service_name(const char *t);
 int avahi_valid_host_name(const char *t);
 
-char *avahi_strdown(char *s);
 char *avahi_strup(char *s);
+char *avahi_strdown(char *s);
 
 AVAHI_C_DECL_END
 
diff --git a/avahi-common/timeval-test.c b/avahi-common/timeval-test.c
deleted file mode 100644
index 6f44034..0000000
--- a/avahi-common/timeval-test.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $Id$ */
-
-/***
-  This file is part of avahi.
- 
-  avahi is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2.1 of the
-  License, or (at your option) any later version.
- 
-  avahi is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
-  Public License for more details.
- 
-  You should have received a copy of the GNU Lesser General Public
-  License along with avahi; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include "util.h"
-
-int main(int argc, char *argv[]) {
-
-    struct timeval a = { 5, 5 }, b;
-
-    b = a;
-
-    printf("%li.%li\n", a.tv_sec, a.tv_usec);
-    avahi_timeval_add(&a, -50);
-
-    printf("%li.%li\n", a.tv_sec, a.tv_usec);
-
-    printf("%lli\n", avahi_timeval_diff(&a, &b));
-}