summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDukePyrolator <anope@s15355730.onlinehome-server.info>2010-06-22 22:27:35 +0200
committerDukePyrolator <anope@s15355730.onlinehome-server.info>2010-06-22 22:27:35 +0200
commit9104822c091d4379c4b5262b26e04709b14d3312 (patch)
treefa3d8fcd5e336b62dac551911d7e50726d2f924d
parentf58d611edc87c566166a181e669317de5be56e46 (diff)
parent0ac122c2d816532994cbb36fe0b536b8a786b80d (diff)
Merge branch '1.9.2-p1' of ssh://dukepyrolator@anope.git.sourceforge.net/gitroot/anope/anope into 1.9.2-p1
-rw-r--r--src/tools/db-convert.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/tools/db-convert.c b/src/tools/db-convert.c
index 883e99447..8d87d9b7d 100644
--- a/src/tools/db-convert.c
+++ b/src/tools/db-convert.c
@@ -280,12 +280,9 @@ int main(int argc, char *argv[])
na = (NickAlias *)calloc(1, sizeof(NickAlias));
READ(read_string(&na->nick, f));
- char *mask;
- char *real;
- char *quit;
- READ(read_string(&mask, f));
- READ(read_string(&real, f));
- READ(read_string(&quit, f));
+ READ(read_string(&na->last_usermask, f));
+ READ(read_string(&na->last_realname, f));
+ READ(read_string(&na->last_quit, f));
READ(read_int32(&tmp32, f));
na->time_registered = tmp32;
@@ -296,9 +293,6 @@ int main(int argc, char *argv[])
na->nc = findcore(s, 0);
na->nc->aliascount++;
free(s);
- free(mask);
- free(real);
- free(quit);
*nalast = na;
nalast = &na->next;