--- lmtp2nntp_config.c 2002/05/28 14:14:44 1.77
+++ lmtp2nntp_config.c 2002/07/02 07:49:01 1.78
@@ -166,7 +166,7 @@
fprintf(stderr, "%s:Error: logging failed to configure \"%s\" channel\n", ctx->progname, l2_handler_var.name);
CU(ERR_EXECUTION);
}
- //FIXME this is cut off on command line!? fprintf(stderr, "DEBUG: ov->data.s = \"%s\"\n", ov->data.s);
+ /* FIXME this is cut off on command line!? fprintf(stderr, "DEBUG: ov->data.s = \"%s\"\n", ov->data.s); */
if ((rc = l2_spec(&ch, ctx->l2_env, ov->data.s)) != L2_OK) {
fprintf(stderr, "%s:Error: logging failed to create stream\n", ctx->progname);
CU(ERR_EXECUTION);
@@ -184,7 +184,7 @@
* should not be used in the remainder of the program flow.
*/
logbook(ctx->l2, L2_LEVEL_NOTICE, "startup, version %s", lmtp2nntp_version.v_gnu);
- //logbook(ctx->l2, L2_LEVEL_NOTICE, "FIXME>>>${option.destination[0]}<<<FIXME>>>${option.destination[1]}<<<");
+ /* logbook(ctx->l2, L2_LEVEL_NOTICE, "FIXME>>>${option.destination[0]}<<<FIXME>>>${option.destination[1]}<<<"); */
/* --version FLAG */
try {
@@ -198,7 +198,7 @@
if (ov->data.f == 1) {
fprintf(stdout, "%s\n", lmtp2nntp_version.v_gnu);
- exit(0); //FIXME
+ exit(0); /* FIXME */
}
}
catch (ex)
@@ -507,7 +507,7 @@
cp = (ov->data.m)[i];
logbook(ctx->l2, L2_LEVEL_DEBUG, "cp = (data.m)[%d] = \"%s\"", i, cp);
if (strrchr(cp, ':') == NULL)
- cp = str_concat(cp, ":nntp", NULL); //FIXME is this a config var/val?
+ cp = str_concat(cp, ":nntp", NULL); /* FIXME is this a config var/val? */
else
cp = str_concat(cp, NULL); /* prepare for free() */
if ((rc = sa_addr_create(&ctx->pns[i].saa)) != SA_OK) {
@@ -515,11 +515,11 @@
throw(0,0,0);
}
if ((rc = sa_addr_u2a(ctx->pns[i].saa, "inet://%s", cp)) != SA_OK) {
- logbook(ctx->l2, L2_LEVEL_ERROR, "option --destination, parsing host address (%s) failed with \"%s\"", cp /*FIXME again, option vs. config */, sa_error(rc));
+ logbook(ctx->l2, L2_LEVEL_ERROR, "option --destination, parsing host address (%s) failed with \"%s\"", cp /* FIXME again, option vs. config */, sa_error(rc));
throw(0,0,0);
}
if ((rc = sa_create(&ctx->pns[i].sa)) != SA_OK) {
- logbook(ctx->l2, L2_LEVEL_ERROR, "option --destination, creating TCP socket (%s) failed with \"%s\"", cp /*FIXME again, option vs. config */, sa_error(rc));
+ logbook(ctx->l2, L2_LEVEL_ERROR, "option --destination, creating TCP socket (%s) failed with \"%s\"", cp /* FIXME again, option vs. config */, sa_error(rc));
throw(0,0,0);
}
ctx->pns[i].nntp = NULL;
@@ -560,7 +560,7 @@
/* --headerrule MULTI */
{
- volatile headerrule_t *hrNew = NULL; // declare and initialize variables which might have resources allocated that need to be cleaned up when an exception is caught
+ volatile headerrule_t *hrNew = NULL; /* declare and initialize variables which might have resources allocated that need to be cleaned up when an exception is caught */
try {
char *cp, *cpP;
int n;
@@ -661,14 +661,14 @@
}
/* establish variable expansion context */
{
- var_rc_t rc;
+ var_rc_t rc2;
- if ((rc = var_create(&ctx->config_varregex)) != VAR_OK) {
- logbook(ctx->l2, L2_LEVEL_ERROR, "option --headerrule, create regex context failed with %s (%d)", var_strerror(ctx->config_varregex, rc, &cp) == VAR_OK ? cp : "Unknown Error", rc);
+ if ((rc2 = var_create(&ctx->config_varregex)) != VAR_OK) {
+ logbook(ctx->l2, L2_LEVEL_ERROR, "option --headerrule, create regex context failed with %s (%d)", var_strerror(ctx->config_varregex, rc2, &cp) == VAR_OK ? cp : "Unknown Error", rc2);
throw(0,0,0);
}
- if ((rc = var_config(ctx->config_varregex, VAR_CONFIG_SYNTAX, &syntax_regex)) != VAR_OK) {
- logbook(ctx->l2, L2_LEVEL_ERROR, "option --headerrule, config regex context failed with %s (%d)", var_strerror(ctx->config_varregex, rc, &cp) == VAR_OK ? cp : "Unknown Error", rc);
+ if ((rc2 = var_config(ctx->config_varregex, VAR_CONFIG_SYNTAX, &syntax_regex)) != VAR_OK) {
+ logbook(ctx->l2, L2_LEVEL_ERROR, "option --headerrule, config regex context failed with %s (%d)", var_strerror(ctx->config_varregex, rc2, &cp) == VAR_OK ? cp : "Unknown Error", rc2);
throw(0,0,0);
}
}
@@ -1089,7 +1089,7 @@
const char *filename = cp;
struct stat sb;
volatile int fd = -1;
- //ex_t ex;
+ /* ex_t ex; */
try {
if (stat(filename, &sb) == -1) throw(0, 0, "stat");
@@ -1108,15 +1108,15 @@
}
{
volatile msg_t *msg = NULL;
- msg_rc_t rc;
+ msg_rc_t rc2;
try {
ctx->msgcount++;
if ((msg = msg_create(ctx->prival)) == NULL) throw(0, 0, "msg_create");
msg->l2 = ctx->l2;
msg->cpMsg = cpBuf;
- if ((rc = msg_split((msg_t *)msg)) != MSG_OK) {
- logbook(ctx->l2, L2_LEVEL_ERROR, "Error splitting message: %s", msg_error(rc));
+ if ((rc2 = msg_split((msg_t *)msg)) != MSG_OK) {
+ logbook(ctx->l2, L2_LEVEL_ERROR, "Error splitting message: %s", msg_error(rc2));
throw(0, 0, "msg_split");
}
msg_headermatrixbuildup((msg_t *)msg);
@@ -1124,8 +1124,8 @@
headerrewrite(ctx);
msg_headermatrixteardwn((msg_t *)msg);
argz_add(&((msg_t *)msg)->azNewsgroups, &((msg_t *)msg)->asNewsgroups, "invalid.test");
- if ((rc = msg_join((msg_t *)msg)) != MSG_OK) {
- logbook(ctx->l2, L2_LEVEL_ERROR, "Error joining message: %s", msg_error(rc));
+ if ((rc2 = msg_join((msg_t *)msg)) != MSG_OK) {
+ logbook(ctx->l2, L2_LEVEL_ERROR, "Error joining message: %s", msg_error(rc2));
throw(0, 0, "msg_join");
}
printf("%s", msg->cpMsg);
@@ -1140,7 +1140,7 @@
}
}
}
- exit(0); //FIXME
+ exit(0); /* FIXME */
}
}
catch (ex)
|
