Commit 884b4b8e authored by Linus Torvalds's avatar Linus Torvalds

Automerge

parents 7539d9d1 4e565367
...@@ -3360,9 +3360,8 @@ static int dtCompare(component_t * key, /* search key */ ...@@ -3360,9 +3360,8 @@ static int dtCompare(component_t * key, /* search key */
dtpage_t * p, /* directory page */ dtpage_t * p, /* directory page */
int si) int si)
{ /* entry slot index */ { /* entry slot index */
register int rc; wchar_t *kname, *name;
register wchar_t *kname, *name; int klen, namlen, len, rc;
register int klen, namlen, len;
idtentry_t *ih; idtentry_t *ih;
dtslot_t *t; dtslot_t *t;
...@@ -3437,9 +3436,8 @@ static int ciCompare(component_t * key, /* search key */ ...@@ -3437,9 +3436,8 @@ static int ciCompare(component_t * key, /* search key */
int si, /* entry slot index */ int si, /* entry slot index */
int flag) int flag)
{ {
register int rc; wchar_t *kname, *name, x;
register wchar_t *kname, *name, x; int klen, namlen, len, rc;
register int klen, namlen, len;
ldtentry_t *lh; ldtentry_t *lh;
idtentry_t *ih; idtentry_t *ih;
dtslot_t *t; dtslot_t *t;
...@@ -3543,8 +3541,8 @@ static int ciCompare(component_t * key, /* search key */ ...@@ -3543,8 +3541,8 @@ static int ciCompare(component_t * key, /* search key */
static void ciGetLeafPrefixKey(dtpage_t * lp, int li, dtpage_t * rp, static void ciGetLeafPrefixKey(dtpage_t * lp, int li, dtpage_t * rp,
int ri, component_t * key, int flag) int ri, component_t * key, int flag)
{ {
register int klen, namlen; int klen, namlen;
register wchar_t *pl, *pr, *kname; wchar_t *pl, *pr, *kname;
wchar_t lname[JFS_NAME_MAX + 1]; wchar_t lname[JFS_NAME_MAX + 1];
component_t lkey = { 0, lname }; component_t lkey = { 0, lname };
wchar_t rname[JFS_NAME_MAX + 1]; wchar_t rname[JFS_NAME_MAX + 1];
......
...@@ -106,9 +106,9 @@ static inline wchar_t *UniStrncpy_le(wchar_t * ucs1, const wchar_t * ucs2, ...@@ -106,9 +106,9 @@ static inline wchar_t *UniStrncpy_le(wchar_t * ucs1, const wchar_t * ucs2,
/* /*
* UniToupper: Convert a unicode character to upper case * UniToupper: Convert a unicode character to upper case
*/ */
static inline wchar_t UniToupper(register wchar_t uc) static inline wchar_t UniToupper(wchar_t uc)
{ {
register UNICASERANGE *rp; UNICASERANGE *rp;
if (uc < sizeof(UniUpperTable)) { /* Latin characters */ if (uc < sizeof(UniUpperTable)) { /* Latin characters */
return uc + UniUpperTable[uc]; /* Use base tables */ return uc + UniUpperTable[uc]; /* Use base tables */
...@@ -129,9 +129,9 @@ static inline wchar_t UniToupper(register wchar_t uc) ...@@ -129,9 +129,9 @@ static inline wchar_t UniToupper(register wchar_t uc)
/* /*
* UniStrupr: Upper case a unicode string * UniStrupr: Upper case a unicode string
*/ */
static inline wchar_t *UniStrupr(register wchar_t * upin) static inline wchar_t *UniStrupr(wchar_t * upin)
{ {
register wchar_t *up; wchar_t *up;
up = upin; up = upin;
while (*up) { /* For all characters */ while (*up) { /* For all characters */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment