interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Loose non standard unexposed prototypes 

getdns_list_add_item & getdns_dict_copy
This commit is contained in:
Willem Toorop 2014-05-21 10:13:02 +02:00
parent 943d1e916a
commit 61e28884b2
2 changed files with 9 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Makefile.in
View File

@ -106,16 +106,19 @@ uninstall:
if test $(have_libev) = 1; then $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(EXTENSION_LIBEV_LIB) ; fi if test $(have_libev) = 1; then $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(EXTENSION_LIBEV_LIB) ; fi
libgetdns_ext_event.la: libgetdns.la extension/libevent.lo libgetdns_ext_event.la: libgetdns.la extension/libevent.lo
$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ extension/libevent.lo ./.libs/libgetdns.la $(EXTENSION_LIBEVENT_LDFLAGS) $(EXTENSION_LIBEVENT_EXT_LIBS) -rpath $(libdir) -version-info $(libversion) -no-undefined -release $(version) $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ extension/libevent.lo ./.libs/libgetdns.la $(EXTENSION_LIBEVENT_LDFLAGS) $(EXTENSION_LIBEVENT_EXT_LIBS) -rpath $(libdir) -version-info $(libversion) -no-undefined -release $(version) -export-symbols $(srcdir)/SYMFILE
libgetdns_ext_uv.la: libgetdns.la extension/libuv.lo libgetdns_ext_uv.la: libgetdns.la extension/libuv.lo
$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ extension/libuv.lo ./.libs/libgetdns.la $(EXTENSION_LIBUV_LDFLAGS) $(EXTENSION_LIBUV_EXT_LIBS) -rpath $(libdir) -version-info $(libversion) -no-undefined -release $(version) $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ extension/libuv.lo ./.libs/libgetdns.la $(EXTENSION_LIBUV_LDFLAGS) $(EXTENSION_LIBUV_EXT_LIBS) -rpath $(libdir) -version-info $(libversion) -no-undefined -release $(version) -export-symbols $(srcdir)/SYMFILE
libgetdns_ext_ev.la: libgetdns.la extension/libev.lo libgetdns_ext_ev.la: libgetdns.la extension/libev.lo
$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ extension/libev.lo ./.libs/libgetdns.la $(EXTENSION_LIBEV_LDFLAGS) $(EXTENSION_LIBEV_EXT_LIBS) -rpath $(libdir) -version-info $(libversion) -no-undefined -release $(version) $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ extension/libev.lo ./.libs/libgetdns.la $(EXTENSION_LIBEV_LDFLAGS) $(EXTENSION_LIBEV_EXT_LIBS) -rpath $(libdir) -version-info $(libversion) -no-undefined -release $(version) -export-symbols $(srcdir)/SYMFILE
libgetdns.la: $(GETDNS_OBJ) libgetdns.la: $(GETDNS_OBJ)
$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $(GETDNS_OBJ) $(LDFLAGS) -rpath $(libdir) -version-info $(libversion) -no-undefined -release $(version) $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $(GETDNS_OBJ) $(LDFLAGS) -rpath $(libdir) -version-info $(libversion) -no-undefined -release $(version) -export-symbols $(srcdir)/SYMFILE
test: FORCE test: FORCE
cd test && $(MAKE) $@ cd test && $(MAKE) $@

62
src/test/tests_dict.c
View File

@ -40,12 +40,6 @@
#define TSTMSGBUF 80 #define TSTMSGBUF 80
/* Prototypes for functions not part of the API
* TODO: remove these
*/
getdns_return_t getdns_list_add_item(struct getdns_list *list, size_t * index);
getdns_return_t getdns_dict_copy(struct getdns_dict *srcdict, struct getdns_dict **dstdict);
/*---------------------------------------- tst_bindatasetget */ /*---------------------------------------- tst_bindatasetget */
/** /**
* test the bindata get and set routines * test the bindata get and set routines
@ -309,7 +303,6 @@ tst_listsetget(void)
{ {
char msg[TSTMSGBUF]; char msg[TSTMSGBUF];
char key[20]; char key[20];
size_t index;
uint32_t int1; uint32_t int1;
uint32_t int2; uint32_t int2;
getdns_return_t retval; getdns_return_t retval;
@ -358,10 +351,8 @@ tst_listsetget(void)
strcpy(key, "foo"); strcpy(key, "foo");
newlist = getdns_list_create(); newlist = getdns_list_create();
getdns_list_add_item(newlist, &index); getdns_list_set_int(newlist, 0, 42);
getdns_list_set_int(newlist, index, 42); getdns_list_set_int(newlist, 1, 52);
getdns_list_add_item(newlist, &index);
getdns_list_set_int(newlist, index, 52);
tstmsg_case_msg("getdns_dict_set_list(dict, key, newlist)"); tstmsg_case_msg("getdns_dict_set_list(dict, key, newlist)");
retval = getdns_dict_set_list(dict, key, newlist); retval = getdns_dict_set_list(dict, key, newlist);
@ -483,53 +474,6 @@ tst_intsetget(void)
return; return;
} /* tst_intsetget */ } /* tst_intsetget */
/*---------------------------------------- tst_copy */
/**
* test the copy and pretty print functions
*/
void
tst_copy(void)
{
char *dictstr = NULL;
struct getdns_dict *dict1 = NULL;
struct getdns_dict *dict2 = NULL;
tstmsg_case_begin("tst_copy");
tstmsg_case_msg("empty list cases");
getdns_dict_copy(NULL, NULL);
dict1 = getdns_dict_create();
getdns_dict_copy(dict1, &dict2);
getdns_dict_destroy(dict2);
/* getdns_dict_copy(NULL, &dict1); */
tstmsg_case_msg("dict1 populate");
getdns_dict_set_int(dict1, "foo", 42);
getdns_dict_set_int(dict1, "bar", 52);
getdns_dict_set_int(dict1, "quz", 62);
dictstr = getdns_pretty_print_dict(dict1);
printf("%s\n", dictstr);
free(dictstr);
tstmsg_case_msg("getdns_dict_copy(dict1, &dict2)");
getdns_dict_copy(dict1, &dict2);
dictstr = getdns_pretty_print_dict(dict2);
printf("%s\n", dictstr);
free(dictstr);
getdns_dict_destroy(dict1);
getdns_dict_destroy(dict2);
tstmsg_case_end();
return;
} /* tst_copy */
/*---------------------------------------- tst_create */ /*---------------------------------------- tst_create */
/** /**
* test the create, destroy and allocation functions * test the create, destroy and allocation functions
@ -580,8 +524,6 @@ main(int argc, char *argv[])
tst_getnames(); tst_getnames();
tst_copy();
tstmsg_prog_end(); tstmsg_prog_end();
return 0; return 0;