DeforaOS/libApp
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use PROGNAME

Browse Source
This commit is contained in:
Pierre Pronchery 2015-06-13 12:09:49 -04:00
parent 100c4ddaa7
commit 25b02ebcc7
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/transport.c
View File

@ -23,6 +23,10 @@
#include <System.h> #include <System.h>
#include "App.h" #include "App.h"
#ifndef PROGNAME
# define PROGNAME "transport"
#endif
/* private */ /* private */
/* types */ /* types */
@ -73,17 +77,17 @@ static int _transport(char const * protocol, char const * name)
/* load the transport plug-in */ /* load the transport plug-in */
if((cwd = getcwd(NULL, 0)) == NULL) if((cwd = getcwd(NULL, 0)) == NULL)
return error_set_print("transport", 2, "%s", strerror(errno)); return error_set_print(PROGNAME, 2, "%s", strerror(errno));
/* XXX rather ugly but does the trick */ /* XXX rather ugly but does the trick */
plugin = plugin_new(cwd, "../src", "transport", protocol); plugin = plugin_new(cwd, "../src", "transport", protocol);
free(cwd); free(cwd);
if(plugin == NULL) if(plugin == NULL)
return error_print("transport"); return error_print(PROGNAME);
transport.ret = 0; transport.ret = 0;
if((transport.plugind = plugin_lookup(plugin, "transport")) == NULL) if((transport.plugind = plugin_lookup(plugin, "transport")) == NULL)
{ {
plugin_delete(plugin); plugin_delete(plugin);
return error_print("transport"); return error_print(PROGNAME);
} }
/* initialize the helper */ /* initialize the helper */
memset(helper, 0, sizeof(*helper)); memset(helper, 0, sizeof(*helper));
@ -109,7 +113,7 @@ static int _transport(char const * protocol, char const * name)
if(transport.server != NULL) if(transport.server != NULL)
transport.plugind->destroy(transport.server); transport.plugind->destroy(transport.server);
plugin_delete(plugin); plugin_delete(plugin);
return error_print("transport"); return error_print(PROGNAME);
} }
transport.message = appmessage_new_callv("hello", -1); transport.message = appmessage_new_callv("hello", -1);
tv.tv_sec = 1; tv.tv_sec = 1;
@ -121,11 +125,11 @@ static int _transport(char const * protocol, char const * name)
_transport_callback_timeout, &transport) != 0 _transport_callback_timeout, &transport) != 0
|| event_loop(helper->event) != 0) || event_loop(helper->event) != 0)
{ {
error_print("transport"); error_print(PROGNAME);
transport.ret = -1; transport.ret = -1;
} }
else if(transport.ret != 0) else if(transport.ret != 0)
error_print("transport"); error_print(PROGNAME);
appmessage_delete(transport.message); appmessage_delete(transport.message);
transport.plugind->destroy(transport.client); transport.plugind->destroy(transport.client);
transport.plugind->destroy(transport.server); transport.plugind->destroy(transport.server);