diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-06-28 09:19:03 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-28 09:19:03 +0100 |
commit | 9b8c553e7206f3bfd52ca501990f82afd00f252b (patch) | |
tree | 2f1be95879bcbb980eb223a5f0f12a512f1444b1 /src | |
parent | be31124ca61c5a503a41762089d4e1cbc9f51ebf (diff) |
drop unnecessary unused functions, and need to bump soname then
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 14 | ||||
-rw-r--r-- | src/fingerprint.c | 13 | ||||
-rw-r--r-- | src/libexttextcat.map | 2 | ||||
-rw-r--r-- | src/wg_mempool.c | 38 |
4 files changed, 7 insertions, 60 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a7121af..cbe8e3d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,23 +3,23 @@ AM_CFLAGS = -D_THREAD_SAFE -D_GNU_SOURCE -DVERBOSE noinst_HEADERS = \ common_impl.h wg_mempool.h -libexttextcat_1_0_includedir = $(includedir)/libexttextcat -libexttextcat_1_0_include_HEADERS = \ +libexttextcat_2_0_includedir = $(includedir)/libexttextcat +libexttextcat_2_0_include_HEADERS = \ common.h constants.h fingerprint.h textcat.h utf8misc.h textcat_properties.h \ $(builddir)/exttextcat-version.h -lib_LTLIBRARIES = libexttextcat-1.0.la -libexttextcat_1_0_la_SOURCES = \ +lib_LTLIBRARIES = libexttextcat-2.0.la +libexttextcat_2_0_la_SOURCES = \ common.c fingerprint.c textcat.c wg_mempool.c utf8misc.c -libexttextcat_1_0_la_LDFLAGS = -no-undefined +libexttextcat_2_0_la_LDFLAGS = -no-undefined bin_PROGRAMS = createfp createfp_SOURCES = createfp.c -createfp_LDADD = libexttextcat-1.0.la +createfp_LDADD = libexttextcat-2.0.la check_PROGRAMS = testtextcat testtextcat_SOURCES = testtextcat.c -testtextcat_LDADD = libexttextcat-1.0.la +testtextcat_LDADD = libexttextcat-2.0.la EXTRA_DIST = libexttextcat.map \ makefile.mk \ diff --git a/src/fingerprint.c b/src/fingerprint.c index 8538e72..272c1b1 100644 --- a/src/fingerprint.c +++ b/src/fingerprint.c @@ -654,19 +654,6 @@ extern int fp_Create(void *handle, const char *buffer, uint4 bufsize, return 1; } -extern void fp_Debug(void *handle) -{ - fp_t *h = (fp_t *) handle; - uint4 i; - printf("------ %s --------\n", h->name); - for (i = 0; i < h->size; i++) - { - printf("%3u: '%s' [%u]\n", i, h->fprint[i].str, h->fprint[i].rank); - } - - -} - extern int fp_Read(void *handle, const char *fname, int maxngrams) { fp_t *h = (fp_t *) handle; diff --git a/src/libexttextcat.map b/src/libexttextcat.map index 4a0090b..7946832 100644 --- a/src/libexttextcat.map +++ b/src/libexttextcat.map @@ -7,7 +7,6 @@ wgmempool_Init wgmempool_Reset wgmempool_alloc - wgmempool_getline wgmempool_strdup special_textcat_Init textcat_Classify @@ -20,7 +19,6 @@ textcat_Version fp_Compare fp_Create - fp_Debug fp_Done fp_Init fp_Name diff --git a/src/wg_mempool.c b/src/wg_mempool.c index 4ad3349..89d35a1 100644 --- a/src/wg_mempool.c +++ b/src/wg_mempool.c @@ -210,42 +210,4 @@ extern char *wgmempool_strdup(void *handle, const char *str) return result; } - -extern char *wgmempool_getline(void *handle, size_t size, FILE * fp) -{ - char *result, *p; - mempool_t *h = (mempool_t *) handle; - memblock_t *block = h->first; - - /*** Enough space? ***/ - if (block->p + size > block->pend + h->maxallocsize) - { - addblock(h); - block = h->first; - } - - result = (char *)block->p; - if (fgets(result, size, fp) == NULL) - { - return NULL; - } - - /** end of stream? **/ - if (feof(fp)) - { - return NULL; - } - - /** find end of line **/ - p = result; - while (*p && *p != '\n' && *p != '\r') - { - p++; - } - *p++ = '\0'; - - block->p = p; - return result; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |