avery/Typing-Test-C
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update makefile, fix generate_words(), work on UI

Browse Source
This commit is contained in:
Aidan Haas
2022-11-10 15:01:12 -05:00
committed by GitHub
parent 0ac050a96d
commit c5d57e9beb
4 changed files with 65 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utilities.c
+8 -2
View File
@@ -7,9 +7,12 @@ void clear_word_array(Word_array *array) {
for (i = 0; i < array->number_of_words; i++) {
free(array->words[i].text);
}
free(array->words);
array->number_of_words = 0;
}
/* Generates a pseudo random number using current millisecond + iteration since
code runs too fast */
int generate_random(int lower, int upper, int c) {
struct timeval te;
gettimeofday(&te, NULL);
@@ -21,7 +24,7 @@ int generate_random(int lower, int upper, int c) {
/* This will go through the word_array structure and find the requested
amount of words */
int generate_words(int number_of_words, Word_array *words, Word_array *to_return) {
int i, k;
int i, k, len = 0;
/* Remember to free me after the test ends! */
@@ -29,12 +32,15 @@ int generate_words(int number_of_words, Word_array *words, Word_array *to_return
to_return->words = malloc(sizeof(Word) * number_of_words);
for (i = 0; i < number_of_words; i++) {
k = generate_random(0, words->number_of_words, i);
k = generate_random(0, words->number_of_words - 1, i);
len += words->words[k].length + 1;
to_return->words[i].length = words->words[k].length;
to_return->words[i].text = malloc(words->words[k].length);
strcpy(to_return->words[i].text, words->words[k].text);
}
to_return->num_characters = len;
return SUCCESS;
}