aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Jackson <pj@sgi.com>2005-10-30 15:03:19 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-30 17:37:27 -0800
commit82da2c372712c772134d01317aa2517c923a74f8 (patch)
tree89e30cd1d0191acc1fa1a03658226bdaa126a077
parent5d57bd39eb3dbf2866b5f5cee8fbd7a29b00c56f (diff)
download96b-common-82da2c372712c772134d01317aa2517c923a74f8.tar.gz
[PATCH] lib/string.c cleanup: restore useful memmove const
A couple of (char *) casts removed in a previous cleanup patch in lib/string.c:memmove() were actually useful, as they suppressed a couple of warnings: assignment discards qualifiers from pointer target type Fix by declaring the local variable const in the first place, so casts aren't needed to strip the const qualifier. Signed-off-by: Paul Jackson <pj@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--lib/string.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/string.c b/lib/string.c
index d7a5ff9b81ea..037a48acedbb 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -488,7 +488,8 @@ EXPORT_SYMBOL(memcpy);
*/
void *memmove(void *dest, const void *src, size_t count)
{
- char *tmp, *s;
+ char *tmp;
+ const char *s;
if (dest <= src) {
tmp = dest;