Minor cast fixes

[pkg/abook.git] / misc.c

diff --git a/misc.c b/misc.c
index 0a58cb96be67593103343ca25c032674321f3f06..225d1563f9e048b981bff605bb7283e6ad9c189e 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -1,6 +1,7 @@
 
 /*
- * misc.c
+ * $Id$
+ *
  * by JH <jheinonen@bigfoot.com>
  *
  * Copyright (C) Jaakko Heinonen
@@ -122,10 +123,13 @@ mkstr (const char *format, ... )
                                format, ap);
                MY_VA_END;
 
-               if (n > -1)
+               if (n > -1 && n < size)
                        return buffer;
 
-               size *= 2;
+               if (n > -1)
+                       size = n + 1;
+               else
+                       size *= 2;
                
                buffer =
 #ifdef ABOOK_SRC
@@ -228,7 +232,7 @@ getaline(FILE *f)
 
        len = 0;
        size = thres;
-       buf = abook_malloc(size);
+       buf = (char *)abook_malloc(size);
 
        while (fgets(buf+len, size-len, f) != NULL) {
                len += strlen(buf+len);