Index: trunk/src_plugins/debug/debug.c =================================================================== --- trunk/src_plugins/debug/debug.c (revision 2180) +++ trunk/src_plugins/debug/debug.c (revision 2181) @@ -28,6 +28,7 @@ #include "data.h" #include "debug_conf.h" #include "action_helper.h" +#include "hid_actions.h" #include "plugins.h" #include "conf.h" #include "error.h" Index: trunk/src_plugins/export_bom/bom.c =================================================================== --- trunk/src_plugins/export_bom/bom.c (revision 2180) +++ trunk/src_plugins/export_bom/bom.c (revision 2181) @@ -502,7 +502,7 @@ PrintBOM(); } -static int bom_usage(char *topic) +static int bom_usage(const char *topic) { fprintf(stderr, "\nbom exporter command line arguments:\n\n"); hid_usage(bom_options, sizeof(bom_options) / sizeof(bom_options[0])); Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 2180) +++ trunk/src_plugins/export_gcode/gcode.c (revision 2181) @@ -860,7 +860,7 @@ { } -static int gcode_usage(char *topic) +static int gcode_usage(const char *topic) { fprintf(stderr, "\ngcode exporter command line arguments:\n\n"); hid_usage(gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0])); Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 2180) +++ trunk/src_plugins/export_gerber/gerber.c (revision 2181) @@ -1166,7 +1166,7 @@ CRASH; } -static int gerber_usage(char *topic) +static int gerber_usage(const char *topic) { fprintf(stderr, "\ngerber exporter command line arguments:\n\n"); hid_usage(gerber_options, sizeof(gerber_options) / sizeof(gerber_options[0])); Index: trunk/src_plugins/export_lpr/lpr.c =================================================================== --- trunk/src_plugins/export_lpr/lpr.c (revision 2180) +++ trunk/src_plugins/export_lpr/lpr.c (revision 2181) @@ -114,7 +114,7 @@ static HID lpr_hid; -static int lpr_usage(char *topic) +static int lpr_usage(const char *topic) { fprintf(stderr, "\nlpr exporter command line arguments:\n\n"); hid_usage(base_lpr_options, sizeof(base_lpr_options) / sizeof(base_lpr_options[0])); Index: trunk/src_plugins/export_nelma/nelma.c =================================================================== --- trunk/src_plugins/export_nelma/nelma.c (revision 2180) +++ trunk/src_plugins/export_nelma/nelma.c (revision 2181) @@ -995,7 +995,7 @@ { } -static int nelma_usage(char *topic) +static int nelma_usage(const char *topic) { fprintf(stderr, "\nnelma exporter command line arguments:\n\n"); hid_usage(nelma_attribute_list, sizeof(nelma_attribute_list) / sizeof(nelma_attribute_list[0])); Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 2180) +++ trunk/src_plugins/export_png/png.c (revision 2181) @@ -1475,7 +1475,7 @@ { } -static int png_usage(char *topic) +static int png_usage(const char *topic) { fprintf(stderr, "\npng exporter command line arguments:\n\n"); hid_usage(png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0])); Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 2180) +++ trunk/src_plugins/export_ps/eps.c (revision 2181) @@ -594,7 +594,7 @@ { } -static int eps_usage(char *topic) +static int eps_usage(const char *topic) { fprintf(stderr, "\neps exporter command line arguments:\n\n"); hid_usage(eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0])); Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 2180) +++ trunk/src_plugins/export_ps/ps.c (revision 2181) @@ -1592,7 +1592,7 @@ ps_inited = 1; } -static int ps_usage(char *topic) +static int ps_usage(const char *topic) { fprintf(stderr, "\nps exporter command line arguments:\n\n"); hid_usage(ps_attribute_list, sizeof(ps_attribute_list) / sizeof(ps_attribute_list[0])); Index: trunk/src_plugins/hid_gtk/gui-config.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-config.c (revision 2180) +++ trunk/src_plugins/hid_gtk/gui-config.c (revision 2181) @@ -551,7 +551,7 @@ *pe = '/'; pe++; -#warning leak: strdup(path) never free'd +#warning leak: strdup(path) never free()d /* ---- Grid Increment/Decrement ---- */ strcpy(pe, "grid"); ghid_coord_entry(vbox, NULL, @@ -698,7 +698,7 @@ return NULL; } -#warning TODO: leak: this is never free'd +#warning TODO: leak: this is never free()d lht_doc_t *config_library_lst_doc; lht_node_t *config_library_lst; Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 2180) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 2181) @@ -1341,7 +1341,7 @@ void lesstif_update_layer_groups() { int sets[MAX_LAYER + 2][MAX_LAYER]; - int i, j, n; + int i, j; LayerGroupType *l = &(PCB->LayerGroups); if (!layer_groups_form) Index: trunk/src_plugins/hid_lesstif/library.c =================================================================== --- trunk/src_plugins/hid_lesstif/library.c (revision 2180) +++ trunk/src_plugins/hid_lesstif/library.c (revision 2181) @@ -68,7 +68,6 @@ static void libnode_select(Widget w, void *v, XmListCallbackStruct * cbs) { - char *args; library_t *e = picks.array[last_pick]; e = &e->data.dir.children.array[cbs->item_position - 1]; if (LoadElementToBuffer(PASTEBUFFER, e->data.fp.loc_info)) Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 2180) +++ trunk/src_plugins/hid_lesstif/main.c (revision 2181) @@ -658,11 +658,10 @@ { char buf[10]; KeySym sym; - int slen; switch (e->type) { case KeyPress: - slen = XLookupString((XKeyEvent *) e, buf, sizeof(buf), &sym, NULL); + XLookupString((XKeyEvent *) e, buf, sizeof(buf), &sym, NULL); switch (sym) { case XK_Escape: XtUnmanageChild(m_cmd); @@ -1270,7 +1269,6 @@ static void work_area_input(Widget w, XtPointer v, XEvent * e, Boolean * ctd) { static int pressed_button = 0; - static int ignore_release = 0; show_crosshair(0); switch (e->type) { @@ -1290,11 +1288,8 @@ if (pressed_button) return; /*printf("click %d\n", e->xbutton.button); */ - if (lesstif_button_event(w, e)) { - ignore_release = 1; + if (lesstif_button_event(w, e)) return; - } - ignore_release = 0; notify_crosshair_change(false); pressed_button = e->xbutton.button; @@ -3673,7 +3668,6 @@ static int lesstif_progress(int so_far, int total, const char *message) { - static bool visible = false; static bool started = false; XEvent e; struct timeval time; @@ -3683,7 +3677,6 @@ if (so_far == 0 && total == 0 && message == NULL) { XtUnmanageChild(progress_dialog); - visible = false; started = false; progress_cancelled = false; return retval; @@ -3747,11 +3740,12 @@ */ } -static int lesstif_usage(char *topic) +static int lesstif_usage(const char *topic) { fprintf(stderr, "\nLesstif GUI command line arguments:\n\n"); hid_usage(lesstif_attribute_list, sizeof(lesstif_attribute_list) / sizeof(lesstif_attribute_list[0])); fprintf(stderr, "\nInvocation: pcb-rnd --gui lesstif [options]\n"); + return 0; } #include "dolists.h" Index: trunk/src_plugins/hid_lesstif/menu.c =================================================================== --- trunk/src_plugins/hid_lesstif/menu.c (revision 2180) +++ trunk/src_plugins/hid_lesstif/menu.c (revision 2181) @@ -401,17 +401,17 @@ for (i = 0; i < LB_NUM; i++) { static char namestr[] = "Label "; char *name = namestr; - int accel_idx = i; + /*int accel_idx = i;*/ Widget btn; name[5] = 'A' + i; switch (i) { case LB_SILK: name = "Silk"; - accel_idx = max_copper_layer; + /*accel_idx = max_copper_layer;*/ break; case LB_RATS: name = "Rat Lines"; - accel_idx = max_copper_layer + 1; + /*accel_idx = max_copper_layer + 1;*/ break; case LB_PINS: name = "Pins/Pads"; @@ -455,19 +455,19 @@ for (i = 0; i < LB_NUMPICK; i++) { static char namestr[] = "Label "; char *name = namestr; - int accel_idx = i; - char buf[20], av[30]; + /*int accel_idx = i;*/ + char av[30]; Widget btn; name[5] = 'A' + i; switch (i) { case LB_SILK: name = "Silk"; - accel_idx = max_copper_layer; + /*accel_idx = max_copper_layer;*/ strcpy(av, "SelectLayer(Silk)"); break; case LB_RATS: name = "Rat Lines"; - accel_idx = max_copper_layer + 1; + /*accel_idx = max_copper_layer + 1;*/ strcpy(av, "SelectLayer(Rats)"); break; default: @@ -627,7 +627,6 @@ static void callback(Widget w, lht_node_t * node, XmPushButtonCallbackStruct * pbcs) { - int vi; have_xy = 0; lesstif_show_crosshair(0); if (pbcs->event && pbcs->event->type == KeyPress) { @@ -723,7 +722,7 @@ } } - printf("KEY lookup: mod=%x sym=%x/%d\n", mods, sym, slen); +/* printf("KEY lookup: mod=%x sym=%x/%d\n", mods, sym, slen); */ slen = hid_cfg_keys_input(&lesstif_keymap, mods, sym, seq, &seq_len); if (slen <= 0) @@ -916,6 +915,7 @@ switch(node->type) { case LHT_HASH: add_res2menu_named(in_menu, node, callback, level); break; case LHT_TEXT: add_res2menu_text_special(in_menu, node, callback); break; + default: /* ignore them */; } } @@ -924,8 +924,6 @@ Widget lesstif_menu(Widget parent, char *name, Arg * margs, int mn) { Widget mb = XmCreateMenuBar(parent, name, margs, mn); - char *filename; - char *home_pcbmenu, *home; int screen; lht_node_t *mr; Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 2180) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 2181) @@ -272,7 +272,7 @@ static int build_netlist_dialog() { - Widget b_sel, b_unsel, b_find, b_ripup, b_rat_on, b_rat_off, l_ops; + Widget b_sel, b_unsel, b_find, /*b_ripup,*/ b_rat_on, /*b_rat_off,*/ l_ops; XmString ops_str; if (!mainwind) @@ -291,7 +291,7 @@ 0, NLB_FORM, NLB_FORM, 0, (XtCallbackProc) nbcb_std_callback, (void *) nbcb_rat_on); stdarg_n = 0; - b_rat_off = netlist_button(netlist_dialog, "rat_off", "Disable for rats", + /*b_rat_off =*/ netlist_button(netlist_dialog, "rat_off", "Disable for rats", 0, NLB_FORM, b_rat_on, 0, (XtCallbackProc) nbcb_std_callback, (void *) nbcb_rat_off); stdarg_n = 0; @@ -308,7 +308,7 @@ stdarg_n = 0; - b_ripup = netlist_button(netlist_dialog, "ripup", "Rip Up", 0, b_rat_on, b_find, 0, (XtCallbackProc) nbcb_ripup, 0); + /*b_ripup =*/ netlist_button(netlist_dialog, "ripup", "Rip Up", 0, b_rat_on, b_find, 0, (XtCallbackProc) nbcb_ripup, 0); stdarg_n = 0; stdarg(XmNbottomAttachment, XmATTACH_WIDGET); Index: trunk/src_plugins/hid_lesstif/styles.c =================================================================== --- trunk/src_plugins/hid_lesstif/styles.c (revision 2180) +++ trunk/src_plugins/hid_lesstif/styles.c (revision 2181) @@ -146,13 +146,12 @@ static void style_value_cb(Widget w, int i, void *cbs) { - Coord n; char *s; if (local_update) return; s = XmTextGetString(w); - n = GetValueEx(s, NULL, NULL, NULL, unit->suffix, NULL); + GetValueEx(s, NULL, NULL, NULL, unit->suffix, NULL); switch (i) { case SSthick: conf_set_design("design/line_thickness", "%s", s); Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 2180) +++ trunk/src_plugins/io_pcb/file.c (revision 2181) @@ -110,15 +110,7 @@ RCSID("$Id$"); -#if !defined(HAS_ATEXIT) && !defined(HAS_ON_EXIT) /* --------------------------------------------------------------------------- - * some local identifiers for OS without an atexit() or on_exit() - * call - */ -static char TMPFilename[80]; -#endif - -/* --------------------------------------------------------------------------- * some local prototypes */ static void WritePCBInfoHeader(FILE *); Index: trunk/src_plugins/io_pcb/parse_l.c =================================================================== --- trunk/src_plugins/io_pcb/parse_l.c (revision 2180) +++ trunk/src_plugins/io_pcb/parse_l.c (revision 2181) @@ -2544,7 +2544,6 @@ int io_pcb_ParseFont(plug_io_t *ctx, FontTypePtr Ptr, char *Filename) { int r = 0; - char *path, *p; yyPCB = NULL; yyFont = Ptr; yyElement = NULL; Index: trunk/src_plugins/io_pcb/parse_l.l =================================================================== --- trunk/src_plugins/io_pcb/parse_l.l (revision 2180) +++ trunk/src_plugins/io_pcb/parse_l.l (revision 2181) @@ -425,7 +425,6 @@ int io_pcb_ParseFont(plug_io_t *ctx, FontTypePtr Ptr, char *Filename) { int r = 0; - char *path, *p; yyPCB = NULL; yyFont = Ptr; yyElement = NULL; Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 2180) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 2181) @@ -198,12 +198,12 @@ TextType *name; name = &parent->Name[1]; if ((name->TextString == NULL) || (*name->TextString == '\0')) - sprintf(s, "%s #%d \\nof #%d", typ, n->to->ID, parent->ID); + sprintf(s, "%s #%ld \\nof #%ld", typ, n->to->ID, parent->ID); else - sprintf(s, "%s #%d \\nof %s", typ, n->to->ID, name->TextString); + sprintf(s, "%s #%ld \\nof %s", typ, n->to->ID, name->TextString); } else - sprintf(s, "%s #%d", typ, n->to->ID); + sprintf(s, "%s #%ld", typ, n->to->ID); g->node2name[n->gid] = s; } g->node2name[0] = strdup("S"); @@ -238,7 +238,6 @@ S = NULL; T = NULL; for (n = short_conns; n != NULL; n = n->next) { - short_conn_t *from; void *spare; spare = NULL; Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 2180) +++ trunk/src_plugins/vendordrill/vendor.c (revision 2181) @@ -171,13 +171,11 @@ int ActionLoadVendorFrom(int argc, char **argv, Coord x, Coord y) { - int i; char *fname = NULL; static char *default_file = NULL; const char *sval; lht_doc_t *doc; lht_node_t *drlres; - int type; bool free_fname = false; cached_drill = -1; @@ -254,7 +252,7 @@ /* extract the drillmap resource */ drlres = lht_tree_path(doc, "/", "/drillmap", 1, NULL); if (drlres != NULL) { - if (drlres->type = LHT_LIST) { + if (drlres->type == LHT_LIST) { lht_node_t *n; for(n = drlres->data.list.first; n != NULL; n = n->next) { if (n->type != LHT_TEXT) @@ -318,7 +316,6 @@ static void apply_vendor_map(void) { - int i; int changed, tot; bool state; @@ -544,7 +541,6 @@ /* deal with the "skip" subresource */ static void process_skips(lht_node_t *res) { - int type; char *sval; int *cnt; char ***lst = NULL;