summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DEMO2
-rwxr-xr-xMakefile.c-common6
-rw-r--r--file/git-hist.c5
-rw-r--r--file/git-hist.h2
-rw-r--r--gfx/cro.c2
-rw-r--r--gfx/diff.c6
-rw-r--r--gfx/diff.h2
-rw-r--r--gui/common.h2
-rw-r--r--gui/fmt-pango.c2
-rw-r--r--gui/gui.c12
-rw-r--r--gui/help.c2
-rw-r--r--gui/history.c2
-rw-r--r--gui/input.c4
-rw-r--r--gui/over.c1
-rw-r--r--gui/render.c2
-rw-r--r--gui/sheet.c2
-rw-r--r--help.html2
-rw-r--r--kicad/delta.c10
-rw-r--r--kicad/ext.h2
-rw-r--r--kicad/lib-render.c2
-rw-r--r--kicad/lib.h1
-rw-r--r--kicad/pl-common.h6
-rw-r--r--misc/diag.h2
23 files changed, 38 insertions, 41 deletions
diff --git a/DEMO b/DEMO
index f80aeff..d636286 100644
--- a/DEMO
+++ b/DEMO
@@ -51,7 +51,7 @@ git clone https://github.com/c4puter/motherboard.git
cd motherboard
git submodule init
git submodule update
-eeshow schlib/library/*.lib *.lib motherboard.sch
+eeshow schlib/library/*.lib *.lib motherboard.sch
eeshow motherboard.pro
cd ../..
diff --git a/Makefile.c-common b/Makefile.c-common
index 487c3ff..a131131 100755
--- a/Makefile.c-common
+++ b/Makefile.c-common
@@ -36,8 +36,8 @@ DEPEND_normal = $(CPP_normal) $(CFLAGS) -MM -MG
ifeq ($(V),1)
CC = $(CC_normal)
AS = $(AS_normal)
- LEX = $(LEX_normal)
- YACC = $(YACC_normal)
+ LEX = $(LEX_normal)
+ YACC = $(YACC_normal)
BUILD =
DEPEND = $(DEPEND_normal)
else
@@ -55,7 +55,7 @@ endif
MKDEP = \
$(DEPEND) $< | \
- sed \
+ sed \
-e 's|^$(basename $(notdir $<))\$(OBJ_SUFFIX):|$@:|' \
-e '/^\(.*:\)\? */{p;s///;s/ *\\\?$$/ /;s/ */:\n/g;H;}' \
-e '$${g;p;}' \
diff --git a/file/git-hist.c b/file/git-hist.c
index 4b81ce8..62d1f01 100644
--- a/file/git-hist.c
+++ b/file/git-hist.c
@@ -37,7 +37,6 @@
struct branch {
const char *name;
git_commit *commit;
-
};
struct vcs_history {
@@ -373,7 +372,7 @@ static char *append(char *s, char *add)
/*
* @@@ This one is a bit inconvenient. It depends both on the information the
* VCS provides, some of which is fairly generic, but some may not be, and
- * the very specific constraints imposed by the markup format of Pango.
+ * the very specific constraints imposed by the markup format of Pango.
*/
char *vcs_git_long_for_pango(struct vcs_hist *h,
@@ -676,7 +675,7 @@ void hist_iterate(struct vcs_history *history,
/* @@@ still haven't tested -+- */
-
+
//#define DEBUG
// http://stackoverflow.com/questions/12132862/how-do-i-get-the-name-of-the-current-branch-in-libgit2
diff --git a/file/git-hist.h b/file/git-hist.h
index c5b7045..58cb7eb 100644
--- a/file/git-hist.h
+++ b/file/git-hist.h
@@ -21,7 +21,7 @@
enum thread {
thread_none = 0,
thread_self = 1 << 0, /* -o- */
- thread_newer = 1 << 1, /* -'- or -+- */
+ thread_newer = 1 << 1, /* -'- or -+- */
thread_older = 1 << 2, /* -.- or -+- */
thread_other = 1 << 3, /* -|- or -+- */
};
diff --git a/gfx/cro.c b/gfx/cro.c
index 6c50ab7..50b0d5f 100644
--- a/gfx/cro.c
+++ b/gfx/cro.c
@@ -286,7 +286,7 @@ static void overlined(cairo_t *cr, const char *s, double h)
overline(cr, ox, oy, g[-1].x + ext.x_advance,
g[-1].y + ext.y_advance, h);
}
-
+
cairo_glyph_free(glyphs);
}
diff --git a/gfx/diff.c b/gfx/diff.c
index 096c252..6aef353 100644
--- a/gfx/diff.c
+++ b/gfx/diff.c
@@ -175,9 +175,9 @@ void *diff_process_file(struct diff *diff, struct file_names *file_names,
free_file_names(file_names);
return NULL;
}
- }
+ }
- if (!file_open(&sch_file, fn->sch, file_names->pro ? &pro_file : NULL))
+ if (!file_open(&sch_file, fn->sch, file_names->pro ? &pro_file : NULL))
goto fail_open;
for (i = 0 ; i != fn->n_libs; i++)
if (!lib_parse_search(&lib, fn->libs[i], fn, &sch_file))
@@ -467,7 +467,7 @@ static int diff_end(void *ctx)
cro_img_reset(gfx_user(diff->new_gfx));
cro_img_reset(gfx_user(diff->gfx));
-
+
old_cr = make_diff(NULL, 0, 0, diff->scale,
gfx_user(diff->gfx), NULL, gfx_user(diff->new_gfx), NULL, NULL,
&changed);
diff --git a/gfx/diff.h b/gfx/diff.h
index 90eb66d..d1fbc18 100644
--- a/gfx/diff.h
+++ b/gfx/diff.h
@@ -39,7 +39,7 @@ void add_area(struct area **areas, int xa, int ya, int xb, int yb,
uint32_t color);
void free_areas(struct area **areas);
-void diff_to_canvas(cairo_t *cr, int cx, int cy, float scale,
+void diff_to_canvas(cairo_t *cr, int cx, int cy, float scale,
struct cro_ctx *old, struct cro_ctx *old_extra,
struct cro_ctx *new, struct cro_ctx *new_extra,
const struct area *areas);
diff --git a/gui/common.h b/gui/common.h
index a801aae..9808e31 100644
--- a/gui/common.h
+++ b/gui/common.h
@@ -184,7 +184,7 @@ void show_index(struct gui *gui);
/* gui.c */
struct gui_sheet *find_corresponding_sheet(struct gui_sheet *pick_from,
- struct gui_sheet *ref_in, const struct gui_sheet *ref);
+ struct gui_sheet *ref_in, const struct gui_sheet *ref);
void mark_aois(struct gui *gui, struct gui_sheet *sheet);
#endif /* !GUI_COMMON_H */
diff --git a/gui/fmt-pango.c b/gui/fmt-pango.c
index 48b8516..6305f82 100644
--- a/gui/fmt-pango.c
+++ b/gui/fmt-pango.c
@@ -62,7 +62,7 @@ unsigned vsfmt_pango(char *buf, const char *fmt, va_list ap)
default:
break;
}
-
+
if (extra) {
tmp2 = u = alloca(len + extra + 1);
for (t = tmp; *t; t++) {
diff --git a/gui/gui.c b/gui/gui.c
index 5cd2a75..b5668c9 100644
--- a/gui/gui.c
+++ b/gui/gui.c
@@ -47,7 +47,7 @@
struct gui_sheet *find_corresponding_sheet(struct gui_sheet *pick_from,
- struct gui_sheet *ref_in, const struct gui_sheet *ref)
+ struct gui_sheet *ref_in, const struct gui_sheet *ref)
{
struct gui_sheet *sheet, *plan_b;
const char *title = ref->sch->title;
@@ -109,7 +109,7 @@ static void select_subsheet(void *user)
found:
sheet = find_corresponding_sheet(gui->new_hist->sheets,
- gui->old_hist->sheets, sheet);
+ gui->old_hist->sheets, sheet);
go_to_sheet(gui, sheet);
}
@@ -274,7 +274,7 @@ static const struct sheet *parse_files(struct gui_hist *hist,
if (fn->pl) {
if (!file_open(&pl_file, fn->pl, leader))
goto fail;
- hist->pl = pl_parse(&pl_file);
+ hist->pl = pl_parse(&pl_file);
file_close(&pl_file);
/*
* We treat failing to parse the page layout as a "minor"
@@ -421,8 +421,8 @@ static void get_history(struct gui *gui, const char *name, int limit)
if (!vcs_git_try(name)) {
gui->vcs_history = NULL;
return;
- }
-
+ }
+
gui->vcs_history = vcs_git_history(name);
if (limit)
gui->hist_size = limit > 0 ? limit : -limit;
@@ -468,7 +468,7 @@ int run_gui(const struct file_names *fn, bool recurse, int limit,
.aois = NULL,
.diff_mode = diff_delta,
.old_hist = NULL,
- .hist_y_offset = 0,
+ .hist_y_offset = 0,
.hist_size = 0,
};
diff --git a/gui/help.c b/gui/help.c
index 4a2537e..22a2973 100644
--- a/gui/help.c
+++ b/gui/help.c
@@ -77,7 +77,7 @@ static GtkWidget *help_content(void)
label = gtk_label_new(NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_label_set_markup(GTK_LABEL(label),
diff --git a/gui/history.c b/gui/history.c
index 6b3c9fe..13a7686 100644
--- a/gui/history.c
+++ b/gui/history.c
@@ -129,7 +129,7 @@ static void render_commit(void *user, void *user_over, int x, int y,
for (walk = hist; walk && walk->skipped; walk = walk->next)
do_render_commit(walk->gui, walk, cr,
VCS_OVERLAYS_X + COMMIT_R,
- y + h / 2, THREAD_DX, h / 2, dy - h / 2,
+ y + h / 2, THREAD_DX, h / 2, dy - h / 2,
&skipped_rgb, &skipped_rgb,
walk == hist, walk->next && !walk->next->skipped);
return;
diff --git a/gui/input.c b/gui/input.c
index 49e310c..1b116ab 100644
--- a/gui/input.c
+++ b/gui/input.c
@@ -207,8 +207,8 @@ static gboolean motion_notify_event(GtkWidget *widget, GdkEventMotion *event,
break;
case input_dragging:
if (sp->ops->drag_move)
- sp->ops->drag_move(sp->user,
- event->x - clicked_x, event->y - clicked_y);
+ sp->ops->drag_move(sp->user,
+ event->x - clicked_x, event->y - clicked_y);
clicked_x = event->x;
clicked_y = event->y;
break;
diff --git a/gui/over.c b/gui/over.c
index f86b05d..b779aee 100644
--- a/gui/over.c
+++ b/gui/over.c
@@ -281,7 +281,6 @@ void overlay_draw_all_d(struct overlay *overlays, cairo_t *cr,
over = over->next;
else
over = over->prev;
-
}
}
diff --git a/gui/render.c b/gui/render.c
index 5abf364..1686042 100644
--- a/gui/render.c
+++ b/gui/render.c
@@ -142,7 +142,7 @@ static struct area *changed_sheets(const struct gui *gui,
if (!sheet_eq(new_sub->sch, old_sub->sch, 1))
add_area(&areas, cx(obj->x, xo, f), cy(obj->y, yo, f),
- cx(obj->x + obj->u.sheet.w, xo, f),
+ cx(obj->x + obj->u.sheet.w, xo, f),
cy(obj->y + obj->u.sheet.h, yo, f), 0xffff00);
}
return areas;
diff --git a/gui/sheet.c b/gui/sheet.c
index d7e6fe6..a09efec 100644
--- a/gui/sheet.c
+++ b/gui/sheet.c
@@ -130,7 +130,7 @@ void zoom_to_extents(struct gui *gui)
gui->y = h / 2;
gtk_widget_get_allocation(gui->da, &alloc);
-
+
sw = w ? (float) ZOOM_MARGIN * alloc.width / w : 1;
sh = h ? (float) ZOOM_MARGIN * alloc.height / h : 1;
gui->scale = sw < sh ? sw : sh;
diff --git a/help.html b/help.html
index b494648..bce5b80 100644
--- a/help.html
+++ b/help.html
@@ -30,7 +30,7 @@
<TD>toggle between old and new revision
<TR>
<TD>Esc
- <TD>cancel current action (exit history, close pop-up,
+ <TD>cancel current action (exit history, close pop-up,
de-highlight glabel, close help)
<TR>
<TD>E
diff --git a/kicad/delta.c b/kicad/delta.c
index 35ed774..2b9a30a 100644
--- a/kicad/delta.c
+++ b/kicad/delta.c
@@ -272,9 +272,9 @@ static bool obj_eq(const struct sch_obj *a, const struct sch_obj *b,
switch (a->type) {
case sch_obj_junction:
- return 1;
+ return 1;
case sch_obj_noconn:
- return 1;
+ return 1;
case sch_obj_glabel:
case sch_obj_text:
if (a->u.text.fn != b->u.text.fn)
@@ -440,9 +440,9 @@ static void init_res(struct sheet *res)
res->title = NULL;
res->file = NULL;
res->path = NULL;
- res->objs = NULL;
- res->next_obj = &res->objs;
- res->next = NULL;
+ res->objs = NULL;
+ res->next_obj = &res->objs;
+ res->next = NULL;
}
diff --git a/kicad/ext.h b/kicad/ext.h
index 77d66a4..38cf60c 100644
--- a/kicad/ext.h
+++ b/kicad/ext.h
@@ -35,7 +35,7 @@ struct file_names {
enum ext identify(const char *path);
-void classify_files(struct file_names *fn, char *const *args,
+void classify_files(struct file_names *fn, char *const *args,
unsigned n_args);
void classify_files_ab(struct file_names *a, struct file_names *b,
char *const *args, unsigned n_args);
diff --git a/kicad/lib-render.c b/kicad/lib-render.c
index 88a161d..88691ec 100644
--- a/kicad/lib-render.c
+++ b/kicad/lib-render.c
@@ -324,10 +324,10 @@ static void draw_pin_line(const struct lib_pin *pin, struct gfx *gfx,
int len = pin->length;
int x[4], y[4];
int ex, ey;
+
if ((shape & pin_inverted) || (shape & pin_falling_edge))
len = pin->length - 2 * PIN_R;
-
x[0] = pin->x;
y[0] = pin->y;
x[1] = pin->x + dx * len;
diff --git a/kicad/lib.h b/kicad/lib.h
index 12addc9..6730166 100644
--- a/kicad/lib.h
+++ b/kicad/lib.h
@@ -127,7 +127,6 @@ struct lib {
struct comp *curr_comp; /* current component */
struct comp **next_comp;
struct lib_obj **next_obj;
-
};
diff --git a/kicad/pl-common.h b/kicad/pl-common.h
index 8b52bf4..3f27fe1 100644
--- a/kicad/pl-common.h
+++ b/kicad/pl-common.h
@@ -31,11 +31,11 @@ struct pl_obj {
pl_obj_text,
} type;
- const char *s; /* tbtext */
+ const char *s; /* tbtext */
int repeat; /* line, rect, tbtext */
- float x, y; /* line, rect, tbtext */
+ float x, y; /* line, rect, tbtext */
int dx, dy;
- float ex, ey; /* line, rect; font size for tbtext */
+ float ex, ey; /* line, rect; font size for tbtext */
int edx, edy;
float incrx, incry;
int incrlabel; /* tbtext */
diff --git a/misc/diag.h b/misc/diag.h
index 8adddbb..501249f 100644
--- a/misc/diag.h
+++ b/misc/diag.h
@@ -32,7 +32,7 @@ extern unsigned verbose;
#define BUG(...) \
fatal("BUG " __FILE__ ":" STRINGIFY_EXPAND(__LINE__) ": " __VA_ARGS__)
-
+
/* ----- Specialized diagnostic functions ---------------------------------- */