p
/
xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 10 Wiki Activity

Get rid of the remaining FAILs

This commit is contained in:
Přemysl Eric Janouch 2016-10-11 12:05:17 +02:00
parent 8028c7fa47
commit 4848354bb9
Signed by: p
GPG Key ID: B715679E3A361BE6
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common.c
View File

@ -34,13 +34,6 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
/// Shorthand to set an error and return failure from the function
#define FAIL(...) \
BLOCK_START \
error_set (e, __VA_ARGS__); \
return 0; \
BLOCK_END
// --- To be moved to liberty -------------------------------------------------- // --- To be moved to liberty --------------------------------------------------
static ssize_t static ssize_t

10
zyklonb.c
View File

@ -1028,11 +1028,17 @@ plugin_launch (struct bot_context *ctx, const char *name, struct error **e)
{ {
const char *plugin_dir = str_map_find (&ctx->config, "plugin_dir"); const char *plugin_dir = str_map_find (&ctx->config, "plugin_dir");
if (!plugin_dir) if (!plugin_dir)
FAIL ("plugin directory not set"); {
error_set (e, "plugin directory not set");
return NULL;
}
int stdin_pipe[2]; int stdin_pipe[2];
if (pipe (stdin_pipe) == -1) if (pipe (stdin_pipe) == -1)
FAIL ("%s: %s", "pipe", strerror (errno)); {
error_set (e, "%s: %s", "pipe", strerror (errno));
return NULL;
}
int stdout_pipe[2]; int stdout_pipe[2];
if (pipe (stdout_pipe) == -1) if (pipe (stdout_pipe) == -1)