Skip to content

Added define for the starting key #21

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
kdx2a wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added define for the starting key #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 10 additions & 8 deletions cgo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
#define VERBOSE "true"

/* some internal defines */
#define KEY_RANGE (('z' - 'a') + 1)
#define KEY_FIRST 'a'
#define KEY_RANGE (('z' - KEY_FIRST) + 1)

/* structs */
typedef struct link_s link_t;
Expand Down Expand Up @@ -311,20 +312,21 @@ int make_key(char c1, char c2, char c3)
return -1;

if (! c3)
return ((c1 - 'a') * KEY_RANGE) + (c2 - 'a');
return ((c1 - KEY_FIRST) * KEY_RANGE) + (c2 - KEY_FIRST);
else
return (((c1 - 'a' + 1) * KEY_RANGE * KEY_RANGE) + ((c2 - 'a') * KEY_RANGE) + (c3 - 'a'));
return (((c1 - KEY_FIRST + 1) * KEY_RANGE * KEY_RANGE) +
((c2 - KEY_FIRST) * KEY_RANGE) + (c3 - KEY_FIRST));
}

void make_key_str(int key, char *c1, char *c2, char *c3) {
if (key < (KEY_RANGE * KEY_RANGE)) {
*c1 = 'a' + (key / KEY_RANGE);
*c2 = 'a' + (key % KEY_RANGE);
*c1 = KEY_FIRST + (key / KEY_RANGE);
*c2 = KEY_FIRST + (key % KEY_RANGE);
*c3 = 0;
} else {
*c1 = 'a' + (key / (KEY_RANGE * KEY_RANGE)) - 1;
*c2 = 'a' + ((key / KEY_RANGE) % KEY_RANGE);
*c3 = 'a' + (key % KEY_RANGE);
*c1 = KEY_FIRST + (key / (KEY_RANGE * KEY_RANGE)) - 1;
*c2 = KEY_FIRST + ((key / KEY_RANGE) % KEY_RANGE);
*c3 = KEY_FIRST + (key % KEY_RANGE);
}
}

Expand Down