Skip to content

Commit

Permalink
Fix bit rot in the 'unfinished' subdir.
Browse files Browse the repository at this point in the history
Several of the source files here won't quite compile any more, because
of minor things like const-correctness and the UI_UPDATE change. Now
they should all build again (without prejudice to how useful they are
once they have built).

The biggest change was to remove the fatal() implementation from the
standalone path.c, because my new plan is that basically everything
that's not linked against a true puzzle frontend will be linked
against nullfe.c, which provides that function anyway.
  • Loading branch information
sgtatham committed Mar 29, 2021
1 parent 84cb4c6 commit 72b28b5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 24 deletions.
4 changes: 2 additions & 2 deletions unfinished/numgame.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ struct operation {
* Text display of the operator, in expressions and for
* debugging respectively.
*/
char *text, *dbgtext;
const char *text, *dbgtext;

/*
* Flags dictating when the operator can be applied.
Expand Down Expand Up @@ -1020,7 +1020,7 @@ void print_recurse_inner(struct sets *s, struct set *ss,
* operand, then write the operator, then the second
* operand, and finally close the paren.
*/
char *op;
const char *op;
int parens, thispri, thisassoc;

/*
Expand Down
23 changes: 3 additions & 20 deletions unfinished/path.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "puzzles.h"

Expand Down Expand Up @@ -530,7 +531,7 @@ if (ctx->sparegrid3[ctx->pathends[i*2]] != i ||

ctx->sparepathends[i*2] = first;
ctx->sparepathends[i*2+1] = last;
//printf("new ends of path %d: %d,%d\n", i, first, last);
/* printf("new ends of path %d: %d,%d\n", i, first, last); */
ctx->pathspare[i] = 2; /* fixed */
}
}
Expand Down Expand Up @@ -839,7 +840,7 @@ static int *gridgen(int w, int h, random_state *rs)
int main(void)
{
int w = 10, h = 8;
random_state *rs = random_init("12345", 5);
random_state *rs = random_new("12345", 5);
int x, y, i, *grid;

for (i = 0; i < 10; i++) {
Expand All @@ -863,21 +864,3 @@ int main(void)
return 0;
}
#endif

#ifdef TEST_GENERAL
#include <stdarg.h>

void fatal(const char *fmt, ...)
{
va_list ap;

fprintf(stderr, "fatal error: ");

va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
va_end(ap);

fprintf(stderr, "\n");
exit(1);
}
#endif
4 changes: 2 additions & 2 deletions unfinished/slide.c
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ static const char *validate_desc(const game_params *params, const char *desc)
int *link;
int mains = 0;
int i, tx, ty, minmoves;
char *ret;
const char *ret;

active = snewn(wh, bool);
link = snewn(wh, int);
Expand Down Expand Up @@ -1395,7 +1395,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
sprintf(data, "M%d-%d", ui->drag_anchor, ui->drag_currpos);
str = dupstr(data);
} else
str = ""; /* null move; just update the UI */
str = UI_UPDATE;

ui->dragging = false;
ui->drag_anchor = ui->drag_currpos = -1;
Expand Down

0 comments on commit 72b28b5

Please sign in to comment.