Fix potential kdelibs problems caused by C style char* casts

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1247432 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 283e163183
commit d9387cffe8

@ -1660,7 +1660,7 @@ canonicalize_path (path)
#ifdef LT_DIRSEP_CHAR #ifdef LT_DIRSEP_CHAR
/* Avoid this overhead where '/' is the only separator. */ /* Avoid this overhead where '/' is the only separator. */
while (ptr = (char*)strchr (ptr, LT_DIRSEP_CHAR)) while (ptr = strchr (ptr, LT_DIRSEP_CHAR))
{ {
*ptr++ = '/'; *ptr++ = '/';
} }
@ -1708,7 +1708,7 @@ find_file (basename, search_path, pdir, handle)
int lendir; int lendir;
char *cur = next; char *cur = next;
next = (char*)strchr (cur, LT_PATHSEP_CHAR); next = strchr (cur, LT_PATHSEP_CHAR);
if (!next) if (!next)
{ {
next = cur + strlen (cur); next = cur + strlen (cur);
@ -2082,7 +2082,7 @@ lt_dlopen (filename)
/* If the canonical module name is a path (relative or absolute) /* If the canonical module name is a path (relative or absolute)
then split it into a directory part and a name part. */ then split it into a directory part and a name part. */
basename = (char*)strrchr (canonical, '/'); basename = strrchr (canonical, '/');
if (basename) if (basename)
{ {
++basename; ++basename;
@ -2275,7 +2275,7 @@ lt_dlopen (filename)
char *last_libname; char *last_libname;
error = trim (&dlname, &line[sizeof (STR_LIBRARY_NAMES) - 1]); error = trim (&dlname, &line[sizeof (STR_LIBRARY_NAMES) - 1]);
if (! error && dlname && if (! error && dlname &&
(last_libname = (char*)strrchr (dlname, ' ')) != NULL) (last_libname = strrchr (dlname, ' ')) != NULL)
{ {
last_libname = strdup (last_libname + 1); last_libname = strdup (last_libname + 1);
LT_DLMEM_REASSIGN (dlname, last_libname); LT_DLMEM_REASSIGN (dlname, last_libname);

Loading…
Cancel
Save