Index: trunk/src/librnd/core/rnd_printf.c =================================================================== --- trunk/src/librnd/core/rnd_printf.c (revision 31028) +++ trunk/src/librnd/core/rnd_printf.c (revision 31029) @@ -430,8 +430,8 @@ enum rnd_allow_e mask = RND_UNIT_ALLOW_ALL_SANE; unsigned long maxfmts; - if ((safe & PCB_SAFEPRINT_arg_max) > 0) - maxfmts = (safe & PCB_SAFEPRINT_arg_max); + if ((safe & RND_SAFEPRINT_arg_max) > 0) + maxfmts = (safe & RND_SAFEPRINT_arg_max); else maxfmts = 1UL<<31; @@ -542,7 +542,7 @@ case 'u': case 'x': case 'X': - if (safe & PCB_SAFEPRINT_COORD_ONLY) + if (safe & RND_SAFEPRINT_COORD_ONLY) return -1; if (spec.array[1] == 'l') tmplen = sprintf(tmp, spec.array, va_arg(args, long)); @@ -555,7 +555,7 @@ case 'f': case 'g': case 'G': - if (safe & PCB_SAFEPRINT_COORD_ONLY) + if (safe & RND_SAFEPRINT_COORD_ONLY) return -1; if (strchr(spec.array, '*')) { int prec = va_arg(args, int); @@ -566,7 +566,7 @@ if (gds_append_len(string, tmp, tmplen) != 0) goto err; break; case 'c': - if (safe & PCB_SAFEPRINT_COORD_ONLY) + if (safe & RND_SAFEPRINT_COORD_ONLY) return -1; if (spec.array[1] == 'l' && sizeof(int) <= sizeof(wchar_t)) tmplen = sprintf(tmp, spec.array, va_arg(args, wchar_t)); @@ -575,7 +575,7 @@ if (gds_append_len(string, tmp, tmplen) != 0) goto err; break; case 's': - if (safe & PCB_SAFEPRINT_COORD_ONLY) + if (safe & RND_SAFEPRINT_COORD_ONLY) return -1; if (spec.array[0] == 'l') { /* TODO: convert wchar to char and append it */ @@ -589,7 +589,7 @@ } break; case 'n': - if (safe & PCB_SAFEPRINT_COORD_ONLY) + if (safe & RND_SAFEPRINT_COORD_ONLY) return -1; /* Depending on gcc settings, this will probably break with * some silly "can't put %n in writable data space" message */ @@ -597,7 +597,7 @@ if (gds_append_len(string, tmp, tmplen) != 0) goto err; break; case 'p': - if (safe & PCB_SAFEPRINT_COORD_ONLY) + if (safe & RND_SAFEPRINT_COORD_ONLY) return -1; tmplen = sprintf(tmp, spec.array, va_arg(args, void *)); if (gds_append_len(string, tmp, tmplen) != 0) goto err; @@ -635,7 +635,7 @@ if (CoordsToString(string, value, 1, &spec, mask, suffix) != 0) goto err; break; case 'H': - if ((safe & PCB_SAFEPRINT_COORD_ONLY) && (value[0] > 1)) + if ((safe & RND_SAFEPRINT_COORD_ONLY) && (value[0] > 1)) return -1; if (CoordsToHumanString(string, value[0], &spec, suffix) != 0) goto err; break; @@ -668,13 +668,13 @@ value[count++] = va_arg(args, rnd_coord_t); case '2': case 'D': - if (safe & PCB_SAFEPRINT_COORD_ONLY) + if (safe & RND_SAFEPRINT_COORD_ONLY) return -1; value[count++] = va_arg(args, rnd_coord_t); if (CoordsToString(string, value, count, &spec, mask & RND_UNIT_ALLOW_ALL_SANE, suffix) != 0) goto err; break; case 'd': - if (safe & PCB_SAFEPRINT_COORD_ONLY) + if (safe & RND_SAFEPRINT_COORD_ONLY) return -1; value[1] = va_arg(args, rnd_coord_t); if (CoordsToString(string, value, 2, &spec, RND_UNIT_ALLOW_MM | RND_UNIT_ALLOW_MIL, suffix) != 0) goto err; @@ -694,7 +694,7 @@ } break; case 'a': - if (safe & PCB_SAFEPRINT_COORD_ONLY) + if (safe & RND_SAFEPRINT_COORD_ONLY) return -1; if (gds_append_len(&spec, ".06f", 4) != 0) goto err; if (suffix == RND_UNIT_SUFFIX) @@ -703,7 +703,7 @@ if (gds_append_len(string, tmp, tmplen) != 0) goto err; break; case 'A': - if (safe & PCB_SAFEPRINT_COORD_ONLY) + if (safe & RND_SAFEPRINT_COORD_ONLY) return -1; if (gds_append_len(&spec, ".0f", 3) != 0) goto err; /* if (suffix == RND_UNIT_SUFFIX) @@ -712,7 +712,7 @@ if (gds_append_len(string, tmp, tmplen) != 0) goto err; break; case 'f': - if (safe & PCB_SAFEPRINT_COORD_ONLY) + if (safe & RND_SAFEPRINT_COORD_ONLY) return -1; gds_append_len(&spec, "f", 1); tmplen = sprintf(tmp, spec.array, va_arg(args, double)); Index: trunk/src/librnd/core/rnd_printf.h =================================================================== --- trunk/src/librnd/core/rnd_printf.h (revision 31028) +++ trunk/src/librnd/core/rnd_printf.h (revision 31029) @@ -95,8 +95,8 @@ * No support for %zu size_t printf spec */ -#ifndef RND_PCB_PRINTF_H -#define RND_PCB_PRINTF_H +#ifndef RND_PRINTF_H +#define RND_PRINTF_H #include #include @@ -104,8 +104,8 @@ #include typedef enum { /* bitmask for printf hardening */ - PCB_SAFEPRINT_arg_max = 1023, /* for internal use */ - PCB_SAFEPRINT_COORD_ONLY = 1024 /* print only coords (%m); anything else will result in error, returning -1 */ + RND_SAFEPRINT_arg_max = 1023, /* for internal use */ + RND_SAFEPRINT_COORD_ONLY = 1024 /* print only coords (%m); anything else will result in error, returning -1 */ } rnd_safe_printf_t; int rnd_fprintf(FILE * f, const char *fmt, ...); Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 31028) +++ trunk/src/librnd/pcb_compat.h (revision 31029) @@ -1203,3 +1203,5 @@ #define PCB_TLF_AUTO_TOOLBAR RND_TLF_AUTO_TOOLBAR #define pcb_tool_s rnd_tool_s #define pcb_tool_t rnd_tool_t +#define PCB_SAFEPRINT_arg_max RND_SAFEPRINT_arg_max +#define PCB_SAFEPRINT_COORD_ONLY RND_SAFEPRINT_COORD_ONLY Index: trunk/src_plugins/exto_std/dimension.c =================================================================== --- trunk/src_plugins/exto_std/dimension.c (revision 31028) +++ trunk/src_plugins/exto_std/dimension.c (revision 31029) @@ -214,7 +214,7 @@ draw_arrow(dim, subc->data, ly, x2, y2, -arrx, arry); /* text */ - if (rnd_safe_snprintf(ttmp, sizeof(ttmp), PCB_SAFEPRINT_COORD_ONLY | 1, dim->fmt, (rnd_coord_t)dim->len) < 0) + if (rnd_safe_snprintf(ttmp, sizeof(ttmp), RND_SAFEPRINT_COORD_ONLY | 1, dim->fmt, (rnd_coord_t)dim->len) < 0) strcpy(ttmp, ""); t = pcb_text_new(ly, pcb_font(PCB, 0, 0), 0, 0, 0, 100, 0, ttmp, pcb_flag_make(0)); tx = t->BoundingBox.X2 - t->BoundingBox.X1;