ncurses 5.9 - patch 20110925

[ncurses.git] / ncurses / tinfo / comp_expand.c

diff --git a/ncurses/tinfo/comp_expand.c b/ncurses/tinfo/comp_expand.c
index 6e79a926b5ac59f33d738523676a3cf654c93449..840240088949acb7d9a46ef2c257ba41ea720716 100644 (file)
--- a/ncurses/tinfo/comp_expand.c
+++ b/ncurses/tinfo/comp_expand.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -35,7 +35,7 @@
 #include <ctype.h>
 #include <tic.h>
 
 #include <ctype.h>
 #include <tic.h>
 

-MODULE_ID("$Id: comp_expand.c,v 1.20 2008/08/16 19:29:42 tom Exp $")
+MODULE_ID("$Id: comp_expand.c,v 1.22 2011/05/21 18:55:07 tom Exp $")

 
 static int
 trailing_spaces(const char *src)
 
 static int
 trailing_spaces(const char *src)


@@ -61,15 +61,15 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
     size_t need = (2 + strlen(str)) * 4;
     int ch;
 
     size_t need = (2 + strlen(str)) * 4;
     int ch;
 

-#if NO_LEAKS

     if (srcp == 0) {
     if (srcp == 0) {

+#if NO_LEAKS

        if (buffer != 0) {
            FreeAndNull(buffer);
            length = 0;
        }
        if (buffer != 0) {
            FreeAndNull(buffer);
            length = 0;
        }

+#endif

        return 0;
     }
        return 0;
     }

-#endif

     if (buffer == 0 || need > length) {
        if ((buffer = typeRealloc(char, length = need, buffer)) == 0)
              return 0;
     if (buffer == 0 || need > length) {
        if ((buffer = typeRealloc(char, length = need, buffer)) == 0)
              return 0;


@@ -91,7 +91,7 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
                    && REALPRINT(str + 1)
                    && str[2] == S_QUOTE) {
                    sprintf(buffer + bufp, "{%d}", str[1]);
                    && REALPRINT(str + 1)
                    && str[2] == S_QUOTE) {
                    sprintf(buffer + bufp, "{%d}", str[1]);

-                   bufp += strlen(buffer + bufp);
+                   bufp += (int) strlen(buffer + bufp);

                    str += 2;
                } else {
                    buffer[bufp++] = *str;
                    str += 2;
                } else {
                    buffer[bufp++] = *str;