Attachment 22333 Details for Bug 19798 – Remove extra / from Loading module line

[patch] Remove extra / from Loading module line

remove-extra-slash.patch (text/plain), 1.17 KB, created by Matt Turner on 2009-01-28 16:14:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Turner

Created: 2009-01-28 16:14:25 UTC

Size: 1.17 KB

patch

obsolete

>diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
>index 3f75493..16105a7 100644
>--- a/hw/xfree86/loader/loadmod.c
>+++ b/hw/xfree86/loader/loadmod.c
>@@ -411,21 +411,21 @@ FindModuleInSubdir(const char *dirpath, const char *module)
>         snprintf(tmpBuf, PATH_MAX, "lib%s.so", module);
>         if (strcmp(direntry->d_name, tmpBuf) == 0) {
>             ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2);
>-            sprintf(ret, "%s/%s", dirpath, tmpBuf);
>+            sprintf(ret, "%s%s", dirpath, tmpBuf);
>             break;
>         }
> 
>         snprintf(tmpBuf, PATH_MAX, "%s_drv.so", module);
>         if (strcmp(direntry->d_name, tmpBuf) == 0) {
>             ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2);
>-            sprintf(ret, "%s/%s", dirpath, tmpBuf);
>+            sprintf(ret, "%s%s", dirpath, tmpBuf);
>             break;
>         }
> 
>         snprintf(tmpBuf, PATH_MAX, "%s.so", module);
>         if (strcmp(direntry->d_name, tmpBuf) == 0) {
>             ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2);
>-            sprintf(ret, "%s/%s", dirpath, tmpBuf);
>+            sprintf(ret, "%s%s", dirpath, tmpBuf);
>             break;
>         }
>     }

Actions: View | Splinter Review

Attachments on bug 19798: 22333

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.