Evolinx/bottle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix clang 8 string-plus-int warnings

Browse Source 
Clang 8 warns that adding a string to an integer does not append to
string. Indeed it doesn't, but that was not the intentetion. Use array
indexing as suggested by the compiler to silence the warning. There
should be no functional change.

Example of warning message:

    alpm.c:71:54: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int]
            sprintf(hookdir, "%s%s", myhandle->root, SYSHOOKDIR + 1);
                                                     ~~~~~~~~~~~^~~
    alpm.c:71:54: note: use array indexing to silence this warning
            sprintf(hookdir, "%s%s", myhandle->root, SYSHOOKDIR + 1);
                                                                ^
                                                     &          [  ]
    1 warning generated.
This commit is contained in:
Rikard Falkeborn 2019-04-05 00:02:51 +02:00 committed by Allan McRae
parent a8b3d1a62a
commit f2a7fb2b96
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libalpm/alpm.c
View File

@ -68,7 +68,7 @@ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath,
* with a slash) correctly, we skip SYSHOOKDIR[0]; the regular +1 therefore
* disappears from the allocation */
MALLOC(hookdir, strlen(myhandle->root) + strlen(SYSHOOKDIR), goto nomem);
sprintf(hookdir, "%s%s", myhandle->root, SYSHOOKDIR + 1);
sprintf(hookdir, "%s%s", myhandle->root, &SYSHOOKDIR[1]);
myhandle->hookdirs = alpm_list_add(NULL, hookdir);
/* set default database extension */

4
src/pacman/conf.c
View File

@ -975,11 +975,11 @@ int setdefaults(config_t *c)
if(c->rootdir) {
char path[PATH_MAX];
if(!c->dbpath) {
snprintf(path, PATH_MAX, "%s/%s", c->rootdir, DBPATH + 1);
snprintf(path, PATH_MAX, "%s/%s", c->rootdir, &DBPATH[1]);
SETDEFAULT(c->dbpath, strdup(path));
}
if(!c->logfile) {
snprintf(path, PATH_MAX, "%s/%s", c->rootdir, LOGFILE + 1);
snprintf(path, PATH_MAX, "%s/%s", c->rootdir, &LOGFILE[1]);
SETDEFAULT(c->logfile, strdup(path));
}
} else {