target.c: Add a cast and change a type

Fixes some errors in C++ build.

gdb/ChangeLog:

	* target.c (memory_xfer_partial): Change type of buf to gdb_byte
	pointer.
	(simple_search_memory): Cast return of memmem.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 568d48610a6b63204726479bb92bda7872ced298..f15dda5b5b8d9ae89f2c8afd12a622eb0b64a8f2 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-26  Simon Marchi  <simon.marchi@polymtl.ca>
+
+       * target.c (memory_xfer_partial): Change type of buf to gdb_byte
+       pointer.
+       (simple_search_memory): Cast return of memmem.
+
 2015-10-26  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * stap-probe.c (handle_stap_probe): Add (const char *) casts.

diff --git a/gdb/target.c b/gdb/target.c
index b8b1e9b4b0346cf864d24aa41383e2492c8efc6d..d7653c4126ff42b3f299cf4e1af22bcb1642c059 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -1235,7 +1235,7 @@ memory_xfer_partial (struct target_ops *ops, enum target_object object,
     }
   else
     {
-      void *buf;
+      gdb_byte *buf;
       struct cleanup *old_chain;
 
       /* A large write request is likely to be partially satisfied
@@ -1245,7 +1245,7 @@ memory_xfer_partial (struct target_ops *ops, enum target_object object,
         subset of it.  Cap writes to 4KB to mitigate this.  */
       len = min (4096, len);
 
-      buf = xmalloc (len);
+      buf = (gdb_byte *) xmalloc (len);
       old_chain = make_cleanup (xfree, buf);
       memcpy (buf, writebuf, len);
 
@@ -2391,8 +2391,8 @@ simple_search_memory (struct target_ops *ops,
       gdb_byte *found_ptr;
       unsigned nr_search_bytes = min (search_space_len, search_buf_size);
 
-      found_ptr = memmem (search_buf, nr_search_bytes,
-                         pattern, pattern_len);
+      found_ptr = (gdb_byte *) memmem (search_buf, nr_search_bytes,
+                                      pattern, pattern_len);
 
       if (found_ptr != NULL)
        {