Add casts to prevent warnings.

diff --git a/argp/argp-fmtstream.c b/argp/argp-fmtstream.c
index ab2e870..0c9b311 100644 (file)
--- a/argp/argp-fmtstream.c
+++ b/argp/argp-fmtstream.c
@@ -157,7 +157,7 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
               the end of the buffer.  */
            nl = fs->p;
        }
-      else if (fs->point_col + (nl - buf) < fs->rmargin)
+      else if (fs->point_col + (nl - buf) < (ssize_t) fs->rmargin)
        {
          /* The buffer contains a full line that fits within the maximum
             line width.  Reset point and scan the next line.  */
@@ -309,7 +309,7 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
 int
 __argp_fmtstream_ensure (struct argp_fmtstream *fs, size_t amount)
 {
-  if (fs->end - fs->p < amount)
+  if ((size_t) (fs->end - fs->p) < amount)
     {
       ssize_t wrote;
 
@@ -330,7 +330,7 @@ __argp_fmtstream_ensure (struct argp_fmtstream *fs, size_t amount)
          return 0;
        }
 
-      if (fs->end - fs->buf < amount)
+      if ((size_t) (fs->end - fs->buf) < amount)
        /* Gotta grow the buffer.  */
        {
          size_t new_size = fs->end - fs->buf + amount;
@@ -354,7 +354,7 @@ __argp_fmtstream_ensure (struct argp_fmtstream *fs, size_t amount)
 ssize_t
 __argp_fmtstream_printf (struct argp_fmtstream *fs, const char *fmt, ...)
 {
-  size_t out;
+  int out;
   size_t size_guess = PRINTF_SIZE_GUESS; /* How much space to reserve. */
 
   do

diff --git a/argp/argp-fmtstream.h b/argp/argp-fmtstream.h
index 280a893..d1a262a 100644 (file)
--- a/argp/argp-fmtstream.h
+++ b/argp/argp-fmtstream.h
@@ -238,7 +238,7 @@ ARGP_FS_EI size_t
 __argp_fmtstream_set_lmargin (argp_fmtstream_t __fs, size_t __lmargin)
 {
   size_t __old;
-  if (__fs->p - __fs->buf > __fs->point_offs)
+  if ((size_t) (__fs->p - __fs->buf) > __fs->point_offs)
     __argp_fmtstream_update (__fs);
   __old = __fs->lmargin;
   __fs->lmargin = __lmargin;
@@ -250,7 +250,7 @@ ARGP_FS_EI size_t
 __argp_fmtstream_set_rmargin (argp_fmtstream_t __fs, size_t __rmargin)
 {
   size_t __old;
-  if (__fs->p - __fs->buf > __fs->point_offs)
+  if ((size_t) (__fs->p - __fs->buf) > __fs->point_offs)
     __argp_fmtstream_update (__fs);
   __old = __fs->rmargin;
   __fs->rmargin = __rmargin;
@@ -262,7 +262,7 @@ ARGP_FS_EI size_t
 __argp_fmtstream_set_wmargin (argp_fmtstream_t __fs, size_t __wmargin)
 {
   size_t __old;
-  if (__fs->p - __fs->buf > __fs->point_offs)
+  if ((size_t) (__fs->p - __fs->buf) > __fs->point_offs)
     __argp_fmtstream_update (__fs);
   __old = __fs->wmargin;
   __fs->wmargin = __wmargin;
@@ -273,7 +273,7 @@ __argp_fmtstream_set_wmargin (argp_fmtstream_t __fs, size_t __wmargin)
 ARGP_FS_EI size_t
 __argp_fmtstream_point (argp_fmtstream_t __fs)
 {
-  if (__fs->p - __fs->buf > __fs->point_offs)
+  if ((size_t) (__fs->p - __fs->buf) > __fs->point_offs)
     __argp_fmtstream_update (__fs);
   return __fs->point_col >= 0 ? __fs->point_col : 0;
 }

diff --git a/argp/argp-help.c b/argp/argp-help.c
index b3d8b36..ed934e0 100644 (file)
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -1086,14 +1086,14 @@ hol_entry_help (struct hol_entry *entry, const struct argp_state *state,
       const char *fstr = filter_doc (tstr, real->key, entry->argp, state);
       if (fstr && *fstr)
        {
-         unsigned col = __argp_fmtstream_point (stream);
+         unsigned int col = __argp_fmtstream_point (stream);
 
          __argp_fmtstream_set_lmargin (stream, uparams.opt_doc_col);
          __argp_fmtstream_set_wmargin (stream, uparams.opt_doc_col);
 
-         if (col > uparams.opt_doc_col + 3)
+         if (col > (unsigned int) (uparams.opt_doc_col + 3))
            __argp_fmtstream_putc (stream, '\n');
-         else if (col >= uparams.opt_doc_col)
+         else if (col >= (unsigned int) uparams.opt_doc_col)
            __argp_fmtstream_puts (stream, "   ");
          else
            indent_to (stream, uparams.opt_doc_col);