diff options
-rw-r--r-- | runtime/ChangeLog | 6 | ||||
-rw-r--r-- | runtime/loc2c-runtime.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/runtime/ChangeLog b/runtime/ChangeLog index 2e14fd53..094fbe85 100644 --- a/runtime/ChangeLog +++ b/runtime/ChangeLog @@ -1,3 +1,9 @@ +2006-05-03 Josh Stone <joshua.i.stone@intel.com> + + * loc2c-runtime.h (deref_string): resolved gcc "warning: + assignment makes integer from pointer without a cast" when + using a pointer as the source address. + 2006-04-28 Martin Hunt <hunt@redhat.com> * vsprintf.c (_stp_vsnprintf): Fix argument size for %p. diff --git a/runtime/loc2c-runtime.h b/runtime/loc2c-runtime.h index af14f395..fb76bbfc 100644 --- a/runtime/loc2c-runtime.h +++ b/runtime/loc2c-runtime.h @@ -1,6 +1,6 @@ /* target operations * Copyright (C) 2005 Red Hat Inc. - * Copyright (C) 2005 Intel Corporation. + * Copyright (C) 2005,2006 Intel Corporation. * * This file is part of systemtap, and is free software. You can * redistribute it and/or modify it under the terms of the GNU General @@ -241,7 +241,7 @@ size_t _len; \ unsigned char _c; \ char *_d = (dst); \ - for (_len = (maxbytes), _addr = (addr); \ + for (_len = (maxbytes), _addr = (uintptr_t)(addr); \ _len > 1 && (_c = deref (1, _addr)) != '\0'; \ --_len, ++_addr) \ *_d++ = _c; \ |