increment counter while deleting a range of locations

for dump_locs, use larger buffer, and static pointers initialized
each time through the loop.

1 files changed, 5 insertions, 3 deletions

diff --git a/server/uloc.c b/server/uloc.c
index 72da7ea..4c33fba 100644
--- a/server/uloc.c
+++ b/server/uloc.c
@@ -1028,7 +1028,7 @@ ulogin_flush_user(ZNotice_t *notice)
 	/* skip over (and delete) matches */
 	j = i + num_match;
 	while (i < j)
-	    delete locations[i];
+	    delete locations[i++];
 
 	/* copy the rest */
 	while (i < num_locs) {
@@ -1241,11 +1241,13 @@ void
 uloc_dump_locs(register FILE *fp)
 {
 	register int i;
-	char buf[BUFSIZ], *bufp = buf;
-	const char *cp;
+	char buf[BUFSIZ*3];
+	static char *bufp;
+	static const char *cp;
 
 	/* delay using stdio so that we can run FAST! */
 	for (i = 0; i < num_locs; i++) {
+		bufp = buf;
 #define cpy(str) do{cp=(str);while(*cp){*bufp++=*cp++;}}while(0)
 		cpy (locations[i]->zlt_user.value ());
 		*bufp++ = '/';