Date:2012-05-25 18:33:54 (11 years 10 months ago)
Author:Werner Almesberger
Commit:424b74e4824f6c84dd7bbb1b0f5e9691a50c0eaf
Message:change use of curly braces with "if-else" to kernel style

Files: dump.c (2 diffs)
expr.c (3 diffs)
file.c (3 diffs)
fpd.y (2 diffs)
gui_frame.c (3 diffs)
gui_inst.c (4 diffs)
gui_tool.c (3 diffs)
inst.c (2 diffs)
postscript.c (1 diff)

Change Details

dump.c
11/*
22 * dump.c - Dump objects in the native FPD format
33 *
4 * Written 2009-2011 by Werner Almesberger
5 * Copyright 2009-2011 by Werner Almesberger
4 * Written 2009-2012 by Werner Almesberger
5 * Copyright 2009-2012 by Werner Almesberger
66 *
77 * This program is free software; you can redistribute it and/or modify
88 * it under the terms of the GNU General Public License as published by
...... 
488488    y = unparse(vec->y);
489489    if (vec->name)
490490        s = stralloc_printf("vec %s(%s, %s)", base, x, y);
491    else {
491    else
492492        s = stralloc_printf("vec %s(%s, %s)", base, x, y);
493    }
494493    free(x);
495494    free(y);
496495    return s;
expr.c
11/*
22 * expr.c - Expressions and values
33 *
4 * Written 2009, 2010 by Werner Almesberger
5 * Copyright 2009, 2010 by Werner Almesberger
4 * Written 2009, 2010, 2012 by Werner Almesberger
5 * Copyright 2009, 2010, 2012 by Werner Almesberger
66 *
77 * This program is free software; you can redistribute it and/or modify
88 * it under the terms of the GNU General Public License as published by
...... 
443443            while (is_id_char(*s, s == s0))
444444                s++;
445445            if (s == s0) {
446                if (*s)
446                if (*s) {
447447                    goto invalid;
448                else {
448                } else {
449449                    fail("incomplete variable name");
450450                    goto fail;
451451                }
...... 
472472        var_unique = unique(var);
473473        free(var);
474474        value_string = eval_string_var(frame, var_unique);
475        if (value_string)
475        if (value_string) {
476476            value_len = strlen(value_string);
477        else {
477        } else {
478478            value = eval_var(frame, var_unique);
479479            if (is_undef(value)) {
480480                fail("undefined variable \"%s\"", var_unique);
file.c
11/*
22 * file.c - File handling
33 *
4 * Written 2009-2011 by Werner Almesberger
5 * Copyright 2009-2011 by Werner Almesberger
4 * Written 2009-2012 by Werner Almesberger
5 * Copyright 2009-2012 by Werner Almesberger
66 *
77 * This program is free software; you can redistribute it and/or modify
88 * it under the terms of the GNU General Public License as published by
...... 
9191    /* save to temporary file */
9292
9393    slash = strrchr(s, '/');
94    if (!slash)
94    if (!slash) {
9595        tmp = stralloc_printf("~%s", s);
96    else {
96    } else {
9797        *slash = 0;
9898        tmp = stralloc_printf("%s/~%s", s, slash+1);
9999        *slash = '/';
...... 
148148
149149void save_fpd(void)
150150{
151    if (save_file_name)
151    if (save_file_name) {
152152        save_with_backup(save_file_name, dump, NULL);
153    else {
153    } else {
154154        if (!dump(stdout, NULL))
155155            perror("stdout");
156156    }
fpd.y
22/*
33 * fpd.y - FootPrint Definition language
44 *
5 * Written 2009-2011 by Werner Almesberger
6 * Copyright 2009-2011 by Werner Almesberger
5 * Written 2009-2012 by Werner Almesberger
6 * Copyright 2009-2012 by Werner Almesberger
77 *
88 * This program is free software; you can redistribute it and/or modify
99 * it under the terms of the GNU General Public License as published by
...... 
252252    struct obj *obj;
253253    struct frame *frame;
254254
255    if (!frame_name)
255    if (!frame_name) {
256256        frame = curr_frame;
257    else {
257    } else {
258258        frame = find_frame(frame_name);
259259        if (!frame) {
260260            yyerrorf("unknown frame \"%s\"", frame_name);
gui_frame.c
11/*
22 * gui_frame.c - GUI, frame window
33 *
4 * Written 2009, 2010 by Werner Almesberger
5 * Copyright 2009, 2010 by Werner Almesberger
4 * Written 2009, 2010, 2012 by Werner Almesberger
5 * Copyright 2009, 2010, 2012 by Werner Almesberger
66 *
77 * This program is free software; you can redistribute it and/or modify
88 * it under the terms of the GNU General Public License as published by
...... 
616616
617617    status_set_type_x(NULL, "value =");
618618    value_string = eval_str(expr, frame);
619    if (value_string)
619    if (value_string) {
620620        status_set_x(NULL, "\"%s\"", value_string);
621    else {
621    } else {
622622        value = eval_num(expr, frame);
623623        if (is_undef(value))
624624            status_set_x(NULL, "undefined");
...... 
17011701    case 1:
17021702        if (is_dragging(frame))
17031703            return FALSE;
1704        if (active_frame != frame)
1704        if (active_frame != frame) {
17051705            select_frame(frame);
1706        else {
1706        } else {
17071707            if (active_frame->name) {
17081708                edit_nothing();
17091709                edit_frame(frame);
gui_inst.c
11/*
22 * gui_inst.c - GUI, instance functions
33 *
4 * Written 2009-2011 by Werner Almesberger
5 * Copyright 2009-2011 by Werner Almesberger
4 * Written 2009-2012 by Werner Almesberger
5 * Copyright 2009-2012 by Werner Almesberger
66 *
77 * This program is free software; you can redistribute it and/or modify
88 * it under the terms of the GNU General Public License as published by
...... 
7979        gp[i].x = points[i].x;
8080        gp[i].y = points[i].y;
8181    }
82    if (fill)
82    if (fill) {
8383        gdk_draw_polygon(DA, gc, fill, gp, n_points);
84    else {
84    } else {
8585        gdk_draw_line(DA, gc, gp[0].x, gp[0].y, gp[1].x, gp[1].y);
8686        gdk_draw_line(DA, gc, gp[1].x, gp[1].y, gp[2].x, gp[2].y);
8787    }
...... 
359359    if (h > w) {
360360        r = w/2;
361361        draw_arc(DA, gc, fill, min.x+r, max.y-r, r, 180, 0);
362        if (fill)
362        if (fill) {
363363            gdk_draw_rectangle(DA, gc, fill,
364364                min.x, min.y+r, w, h-2*r);
365        else {
365        } else {
366366            gdk_draw_line(DA, gc, min.x, min.y+r, min.x, max.y-r);
367367            gdk_draw_line(DA, gc, max.x, min.y+r, max.x, max.y-r);
368368        }
...... 
370370    } else {
371371        r = h/2;
372372        draw_arc(DA, gc, fill, min.x+r, min.y+r, r, 90, 270);
373        if (fill)
373        if (fill) {
374374            gdk_draw_rectangle(DA, gc, fill,
375375                min.x+r, min.y, w-2*r, h);
376        else {
376        } else {
377377            gdk_draw_line(DA, gc, min.x+r, min.y, max.x-r, min.y);
378378            gdk_draw_line(DA, gc, min.x+r, max.y, max.x-r, max.y);
379379        }
gui_tool.c
11/*
22 * gui_tool.c - GUI, tool bar
33 *
4 * Written 2009-2011 by Werner Almesberger
5 * Copyright 2009-2011 by Werner Almesberger
4 * Written 2009-2012 by Werner Almesberger
5 * Copyright 2009-2012 by Werner Almesberger
66 *
77 * This program is free software; you can redistribute it and/or modify
88 * it under the terms of the GNU General Public License as published by
...... 
556556    if (a2 < a1)
557557        a2 += 360.0;
558558
559    if (i != 2)
559    if (i != 2) {
560560        r_save = r;
561    else {
561    } else {
562562        r_save = hypot(to.x-c.x, to.y-c.y);
563563        if (r > r_save)
564564            r_save = r;
...... 
10251025    tool_cancel_drag();
10261026    if (state.new && ops->end_new_raw)
10271027        return ops->end_new_raw(state.new, to);
1028    if (state.new && ops->find_point)
1028    if (state.new && ops->find_point) {
10291029        end = ops->find_point(to);
1030    else {
1030    } else {
10311031        if (state.inst && state.inst->ops->find_point)
10321032            end = state.inst->ops->find_point(state.inst, to);
10331033        else
inst.c
509509
510510    status_set_xy(d);
511511    tip = "Angle of diagonal";
512    if (!d.x && !d.y)
512    if (!d.x && !d.y) {
513513        status_set_angle(tip, "a = 0 deg");
514    else {
514    } else {
515515        status_set_angle(tip, "a = %3.1f deg", theta(a, b));
516516    }
517517    if (d.x < 0)
...... 
716716    walk = &frame->vecs;
717717    while (*walk != to_vec) {
718718        v = *walk;
719        if (!v->mark)
719        if (!v->mark) {
720720            walk = &v->next;
721        else {
721        } else {
722722            *walk = v->next;
723723            v->next = *anchor;
724724            *anchor = v;
postscript.c
11351135    bbox = inst_get_bbox();
11361136    cx = (bbox.min.x+bbox.max.x)/2;
11371137    cy = (bbox.min.y+bbox.max.y)/2;
1138    if (active_params.zoom)
1138    if (active_params.zoom) {
11391139        f = active_params.zoom;
1140    else {
1140    } else {
11411141        fx = 2.0*PAGE_HALF_WIDTH/(bbox.max.x-bbox.min.x);
11421142        fy = 2.0*PAGE_HALF_HEIGHT/(bbox.max.y-bbox.min.y);
11431143        f = fx < fy ? fx : fy;

Archive Download the corresponding diff file

Branches:
master



interactive