"thread apply 1 -- -" vs "frame apply level 0 -- -"

[deliverable/binutils-gdb.git] / gdb / charset.c

diff --git a/gdb/charset.c b/gdb/charset.c
index fcb24a488239b57ef022c1b0c5d6971b8476584d..5d8a99660319d7ecec4816cdaf443ca450298d4d 100644 (file)
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -1,6 +1,6 @@
 /* Character set conversion support for GDB.
 
-   Copyright (C) 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -21,12 +21,12 @@
 #include "charset.h"
 #include "gdbcmd.h"
 #include "gdb_obstack.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include "charset-list.h"
-#include "vec.h"
-#include "environ.h"
+#include "common/vec.h"
+#include "common/environ.h"
 #include "arch-utils.h"
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 #include <ctype.h>
 
 #ifdef USE_WIN32API
@@ -295,9 +295,6 @@ static struct gdbarch *be_le_arch;
 static void
 set_be_le_names (struct gdbarch *gdbarch)
 {
-  int i, len;
-  const char *target_wide;
-
   if (be_le_arch == gdbarch)
     return;
   be_le_arch = gdbarch;
@@ -307,6 +304,9 @@ set_be_le_names (struct gdbarch *gdbarch)
   target_wide_charset_le_name = "UTF-32LE";
   target_wide_charset_be_name = "UTF-32BE";
 #else
+  int i, len;
+  const char *target_wide;
+
   target_wide_charset_le_name = NULL;
   target_wide_charset_be_name = NULL;
 
@@ -548,7 +548,7 @@ convert_between_encodings (const char *from, const char *to,
 
       /* Now make sure that the object on the obstack only includes
         bytes we have converted.  */
-      obstack_blank_fast (output, -outleft);
+      obstack_blank_fast (output, -(ssize_t) outleft);
 
       if (r == (size_t) -1)
        {