Index: cam.c =================================================================== --- cam.c (revision 30902) +++ cam.c (revision 30903) @@ -106,7 +106,7 @@ return cam_exec(ctx); } - pcb_message(PCB_MSG_ERROR, "cam: can not find job configuration '%s'\n", job); + rnd_message(PCB_MSG_ERROR, "cam: can not find job configuration '%s'\n", job); return -1; } @@ -169,7 +169,7 @@ for(n = 3; n < argc; n++) { RND_PCB_ACT_CONVARG(n, FGW_STR, cam, opt = argv[n].val.str); if (cam_parse_opt(&ctx, opt) != 0) { - pcb_message(PCB_MSG_ERROR, "cam: invalid action option '%s'\n", opt); + rnd_message(PCB_MSG_ERROR, "cam: invalid action option '%s'\n", opt); cam_uninit_inst(&ctx); RND_ACT_IRES(1); return 0; @@ -181,7 +181,7 @@ } else { if (arg == NULL) { - pcb_message(PCB_MSG_ERROR, "cam: need one more argument for '%s'\n", cmd); + rnd_message(PCB_MSG_ERROR, "cam: need one more argument for '%s'\n", cmd); cam_uninit_inst(&ctx); RND_ACT_IRES(1); return 0; @@ -228,7 +228,7 @@ { int d, s, oargc; if (*argc < 1) { - pcb_message(PCB_MSG_ERROR, "-x cam needs a job name\n"); + rnd_message(PCB_MSG_ERROR, "-x cam needs a job name\n"); return -1; } @@ -247,7 +247,7 @@ else if (strcmp(opt, "-o") == 0) { s++; (*argc)--; if (cam_parse_set_var(&cam_export_ctx, (*argv)[s]) != 0) { - pcb_message(PCB_MSG_ERROR, "cam -o requires a key=value argument\n"); + rnd_message(PCB_MSG_ERROR, "cam -o requires a key=value argument\n"); goto err; } } @@ -271,7 +271,7 @@ cam_init_inst_fn(&cam_export_ctx); if (cam_call(cam_export_job, &cam_export_ctx) != 0) - pcb_message(PCB_MSG_ERROR, "CAM job %s failed\n", cam_export_job); + rnd_message(PCB_MSG_ERROR, "CAM job %s failed\n", cam_export_job); cam_uninit_inst(&cam_export_ctx); free(cam_export_job); Index: cam_compile.c =================================================================== --- cam_compile.c (revision 30902) +++ cam_compile.c (revision 30903) @@ -93,7 +93,7 @@ case PCB_CAM_WRITE: if (ctx->exporter == NULL) { - pcb_message(PCB_MSG_ERROR, "cam: no exporter selected before write\n"); + rnd_message(PCB_MSG_ERROR, "cam: no exporter selected before write\n"); return -1; } @@ -108,7 +108,7 @@ argc = ctx->argc; argv = ctx->argv; if (ctx->exporter->parse_arguments(ctx->exporter, &argc, &argv) != 0) { - pcb_message(PCB_MSG_ERROR, "cam: exporter '%s' refused the arguments\n", code->op.write.arg); + rnd_message(PCB_MSG_ERROR, "cam: exporter '%s' refused the arguments\n", code->op.write.arg); ctx->argv[0] = NULL; ctx->argv[1] = NULL; return -1; @@ -217,7 +217,7 @@ } code->op.plugin.exporter = pcb_hid_find_exporter(arg); if (code->op.plugin.exporter == NULL) { - pcb_message(PCB_MSG_ERROR, "cam: can not find export plugin: '%s'\n", arg); + rnd_message(PCB_MSG_ERROR, "cam: can not find export plugin: '%s'\n", arg); return -1; } free(ctx->args); @@ -249,7 +249,7 @@ code->op.plugin.argv[ctx->argc] = NULL; } else { - pcb_message(PCB_MSG_ERROR, "cam: syntax error (unknown instruction): '%s'\n", cmd); + rnd_message(PCB_MSG_ERROR, "cam: syntax error (unknown instruction): '%s'\n", cmd); return -1; } return 0;