mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rewrite the nickname replacement function

Browse source 
This function had a couple of bugs. Two different off by one errors and on
top of that it was matching only the deviceid instead of model and
deviceid.

So I simply rewrote it to match against the full pattern and take a much
more straight forward approach to replacing the entry for the divecomputer
under consideration. If the new nickname is entry this implementation
allocates one extra byte - but that didn't seem worth the extra code to
fix it.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-01-03 12:29:06 -08:00
parent 8dbe3528b4
commit 6f8e9bcff3
1 changed files with 10 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

31
gtk-gui.c
View file

@ -2190,40 +2190,29 @@ static char *cleanedup_nickname(const char *nickname, int len)
void replace_nickname_nicknamestring(const char *model, int deviceid, const char *nickname) void replace_nickname_nicknamestring(const char *model, int deviceid, const char *nickname)
{ {
char buf[11]; char pattern[160];
char *entry, *comma1, *comma2, *brace, *new_nn; char *entry, *brace, *new_nn;
int len; int len;
if (!nickname) if (!nickname)
nickname = ""; nickname = "";
snprintf(buf, sizeof(buf), "{%08x,", deviceid); snprintf(pattern, sizeof(pattern), "{%08x,%s", deviceid, model);
entry = strstr(nicknamestring, buf); entry = strstr(nicknamestring, pattern);
if (!entry) if (!entry)
/* this cannot happen as we know we have an entry for this deviceid */ /* this cannot happen as we know we have an entry for this deviceid */
goto bail; goto bail;
len = strlen(entry); len = strlen(entry);
comma1 = g_utf8_strchr(entry, len, ','); brace = g_utf8_strchr(entry, len, '}');
if (!comma1)
goto bail;
len = strlen(comma1);
comma2 = g_utf8_strchr(comma1, len, ',');
brace = g_utf8_strchr(comma1, len, '}');
if (!brace) if (!brace)
goto bail; goto bail;
if (!comma2 || brace < comma2) { *entry = *brace = '\0';
/* didn't have a nickname, so add one */ len = strlen(nicknamestring) + strlen(brace + 1) + strlen(pattern) + strlen(nickname) + 3;
len = strlen(nicknamestring) + strlen(nickname) + 2;
*brace = '\0';
} else {
/* replace the nickname */
len = strlen(nicknamestring) + strlen(nickname) - (brace - comma2) + 1;
*comma2 = '\0';
}
new_nn = malloc(len); new_nn = malloc(len);
if (strlen(nickname)) if (strlen(nickname))
snprintf(new_nn, len, "%s,%s}%s", nicknamestring, nickname, brace + 1); snprintf(new_nn, len, "%s%s,%s}%s", nicknamestring, pattern, nickname, brace + 1);
else else
snprintf(new_nn, len, "%s}%s", nicknamestring, brace + 1); snprintf(new_nn, len, "%s%s}%s", nicknamestring, pattern, brace + 1);
free(nicknamestring); free(nicknamestring);
nicknamestring = new_nn; nicknamestring = new_nn;
return; return;