Skip to content

Fix some portability issues #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcin-serwin wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix some portability issues #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f31049b
consistently use CHAR_MAX for array bounds
marcin-serwin Apr 27, 2025
6c3ae6c
don't assume that EOF fits into char
marcin-serwin Apr 27, 2025
582e6aa
check if visual sound is started before stopping
marcin-serwin Apr 27, 2025
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
4 changes: 2 additions & 2 deletions src/parsing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ void io_getLevels(level** ls, char* fn){
memset(io_cs, 0, sizeof(color) * CHAR_MAX);
*ls = salloc(sizeof(level) * CHAR_MAX);
memset(*ls, 0, sizeof(level *) * CHAR_MAX);
char c;
char name = '\0';
int c;
int name = '\0';
while((c = fgetc(f)) != EOF){
if (c == 'C' || c == 'O' || c == 'L') {
name = fgetc(f);
Expand Down
4 changes: 2 additions & 2 deletions src/parsing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ int io_getFont(bool**, char*);

void io_getColor(FILE*, color*);

void io_getLevel(FILE*, level*, obj[127]);
void io_getLevel(FILE*, level*, obj[CHAR_MAX]);

void io_getObj(FILE*, obj*, char, color[127]);
void io_getObj(FILE*, obj*, char, color[CHAR_MAX]);

// TODO: this is named terribly. There should be another function io_readLevels that's exposed. this should be private and take in FILE*
void io_getLevels(level**, char*);
Expand Down
3 changes: 3 additions & 0 deletions src/visual_sounds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,6 +921,9 @@ void vs_mainPlay(int snd) {
}

void vs_mainStop() {
if (vs_mainVisual == SND_none) {
return;
}
vs_sounds[vs_mainVisual].cur = NULL;
vs_mainVisual = SND_none;
}
Expand Down