Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions lib/bound.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,10 @@ crossings. This may require replacing the original weave with one, two, or
more new weaves. If more than two are needed, do not set *one* or *two*.
------------------------------------------------------------------------------
*/
void b_one_pair(list, list2, one, two)
word *list; /* list of original inputs/outputs, modified by this routine */
word *list2; /* inputs/outputs of the second new weave */
word *one; /* will one new weave suffice? */
word *two; /* will two new weaves suffice? */
void b_one_pair(word *list, /* list of original inputs/outputs, modified by this routine */
word *list2, /* inputs/outputs of the second new weave */
word *one, /* will one new weave suffice? */
word *two) /* will two new weaves suffice? */
{
word a;
word i;
Expand Down
2 changes: 1 addition & 1 deletion lib/bound.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ There are three representations of weave boundaries.
---------------------------------------------------------------------------
*/
#define b_cross( inp1, inp2, outp1, outp2) \
(((inp1)<(inp2))==((inp2)<(outp1))==((outp1)<(outp2))==((inp1)<(outp2)))
((((inp1)<(inp2))==((inp2)<(outp1)))==(((outp1)<(outp2))==((inp1)<(outp2))))


/*
Expand Down
3 changes: 1 addition & 2 deletions lib/dllink.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ void l_add(dllink *inp, /* the next crossing in this string */
This deletes a given dllink from a loop
------------------------------------------------------------------------------
*/
void l_del(l)
dllink **l;
void l_del(dllink **l)
{
dllink *ll = *l;

Expand Down
14 changes: 7 additions & 7 deletions lib/order.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if (1) \
/* This assumes that every crossing is used.
This lists the crossings in an order my algorithm will hopefully like. */
static void o_order2(
crossing *k,
const crossing *k,
word *oldorder,
word *order,
word crossings)
Expand All @@ -37,8 +37,8 @@ static void o_order2(
*endp,
tmp1,
tmp2;
crossing *kp,
*kp2;
const crossing *kp,
*kp2;

for (ip = tab, endp = tab+crossings; ip != endp;) *(ip++) = 0;
*order = oldorder[crossings-1];
Expand Down Expand Up @@ -69,7 +69,7 @@ static void o_order2(

/* This assumes that every crossing is used.
This lists the crossings in an order my algorithm will hopefully like. */
static void o_order1(crossing *k,
static void o_order1(const crossing *k,
word *oldorder,
word *order,
word crossings)
Expand All @@ -80,7 +80,7 @@ static void o_order1(crossing *k,
*endp,
tmp1,
tmp2;
crossing *kp2;
const crossing *kp2;

for (ip = tab, endp = tab+crossings; ip != endp;) *(ip++) = 0;
*order = oldorder[crossings-1];
Expand Down Expand Up @@ -110,7 +110,7 @@ static void o_order1(crossing *k,
static void o_add(word *n, /* in/out: the number of strings in the weave */
dllink **boundary,
word *going_in, /* in/out: which strings are inputs */
crossing *k,
const crossing *k,
word newcross,
Instruct *answer)
{
Expand Down Expand Up @@ -229,7 +229,7 @@ static void o_delete(word *n,
static void o_one_make(word *n,
dllink **boundary,
word *going_in,
crossing *k,
const crossing *k,
word which,
Instruct *answer)
{
Expand Down
1 change: 0 additions & 1 deletion test/test_example.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ int main(int argc, char *argv[])
f = fopen(argv[1], "r");
if (f == NULL)
{
fclose(f);
return 1;
}

Expand Down