Skip to content

ReadKey method incorrect reading from file #8

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
ank4r wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ReadKey method incorrect reading from file #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d153723
fixed ReadKey descriptor reading
ank4r Aug 22, 2016
c6e04ed
fixed ReadKey descriptor reading
ank4r Aug 22, 2016
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
18 changes: 11 additions & 7 deletions VocabLib/keys2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,23 +251,27 @@ int ReadKeys(FILE *fp, short int **keys, keypt_t **info)
(*info)[i].orient = ori;
}

char buf[1024];
char buffer[1024];
char *buf = buffer;
fgets(buf, 1024, fp);
int offset;
for (int line = 0; line < 7; line++) {
fgets(buf, 1024, fp);


if (line < 6) {
sscanf(buf,
"%hu %hu %hu %hu %hu %hu %hu %hu %hu %hu "
"%hu %hu %hu %hu %hu %hu %hu %hu %hu %hu",
"%hu %hu %hu %hu %hu %hu %hu %hu %hu %hu %n",
p+0, p+1, p+2, p+3, p+4, p+5, p+6, p+7, p+8, p+9,
p+10, p+11, p+12, p+13, p+14,
p+15, p+16, p+17, p+18, p+19);

p+15, p+16, p+17, p+18, p+19, &offset);
p += 20;
buf += offset;
} else {
sscanf(buf,
"%hu %hu %hu %hu %hu %hu %hu %hu",
p+0, p+1, p+2, p+3, p+4, p+5, p+6, p+7);

p += 8;
}
}
Expand Down Expand Up @@ -349,7 +353,7 @@ int ReadKeysGzip(gzFile fp, short int **keys, keypt_t **info)
"%hu %hu %hu %hu %hu %hu %hu %hu %hu %hu",
p+0, p+1, p+2, p+3, p+4, p+5, p+6, p+7, p+8, p+9,
p+10, p+11, p+12, p+13, p+14,
p+15, p+16, p+17, p+18, p+19);
p+15, p+16, p+17, p+18, p+19 );

p += 20;
} else {
Expand Down