diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2022-01-19 00:45:43 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:08:46 +0200 |
commit | 4875a15ca61358a1c95b156b2279fce092451278 (patch) | |
tree | 79054df1730d4723658b02cec311bc8ba7655662 /nx-X11/lib/src/Xrm.c | |
parent | a502149a844736dcc7f7dedd7c63229c74a448ee (diff) | |
download | nx-libs-4875a15ca61358a1c95b156b2279fce092451278.tar.gz nx-libs-4875a15ca61358a1c95b156b2279fce092451278.tar.bz2 nx-libs-4875a15ca61358a1c95b156b2279fce092451278.zip |
Update libNX_X11 to upstream's libX11-1.7.3.1-10-gd60ede78
Diffstat (limited to 'nx-X11/lib/src/Xrm.c')
-rw-r--r-- | nx-X11/lib/src/Xrm.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nx-X11/lib/src/Xrm.c b/nx-X11/lib/src/Xrm.c index c285e4221..5a68da3b1 100644 --- a/nx-X11/lib/src/Xrm.c +++ b/nx-X11/lib/src/Xrm.c @@ -81,7 +81,7 @@ information is kept on a per-level basis. (3) Sometimes the widget instance tree is structured such that you get the same class name repeated on the fully qualified widget name. This can result in the -same database level occuring multiple times on the search list. The code below +same database level occurring multiple times on the search list. The code below only checks to see if you get two identical search lists in a row, rather than look back through all database levels, but in practice this removes all duplicates I've ever observed. @@ -897,7 +897,7 @@ static void PutEntry( /* bump to loose table, if any */ table = *(prev = &table->next); if (!table || table->name != q || - (!quarks[2]) != table->leaf) + !quarks[2] != table->leaf) break; /* not found */ } } @@ -1047,7 +1047,7 @@ XrmQPutStringResource( if (!*pdb) *pdb = NewDatabase(); value.addr = (XPointer) str; - value.size = strlen(str)+1; + value.size = (unsigned) strlen(str) + 1; _XLockMutex(&(*pdb)->linfo); PutEntry(*pdb, bindings, quarks, XrmQString, &value); _XUnlockMutex(&(*pdb)->linfo); @@ -1307,7 +1307,7 @@ static void GetDatabase( char oldc; /* - * A parsing error has occured, toss everything on the line + * A parsing error has occurred, toss everything on the line * a new_line can still be escaped with a '\'. */ @@ -1477,7 +1477,7 @@ static void GetDatabase( /* * It is important to make sure that there is room for at least * four more characters in the buffer, since I can add that - * many characters into the buffer after a backslash has occured. + * many characters into the buffer after a backslash has occurred. */ if (ptr + len > ptr_max) { @@ -1532,7 +1532,7 @@ XrmPutStringResource( if (!*pdb) *pdb = NewDatabase(); XrmStringToBindingQuarkList(specifier, bindings, quarks); value.addr = (XPointer) str; - value.size = strlen(str)+1; + value.size = (unsigned) strlen(str)+1; _XLockMutex(&(*pdb)->linfo); PutEntry(*pdb, bindings, quarks, XrmQString, &value); _XUnlockMutex(&(*pdb)->linfo); @@ -1637,11 +1637,11 @@ GetIncludeFile( len = str - base + 1; if (len + fnamelen >= BUFSIZ) return; - strncpy(realfname, base, len); - strncpy(realfname + len, fname, fnamelen); + strncpy(realfname, base, (size_t) len); + strncpy(realfname + len, fname, (size_t) fnamelen); realfname[len + fnamelen] = '\0'; } else { - strncpy(realfname, fname, fnamelen); + strncpy(realfname, fname, (size_t) fnamelen); realfname[fnamelen] = '\0'; } if (!(str = ReadInFile(realfname))) |