diff options
| author | Wayne Davison <wayned@users.sourceforge.net> | 2005-11-01 03:26:57 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@users.sourceforge.net> | 2005-11-01 03:26:57 +0000 |
| commit | 781711e7331b79dddfe890b8bc4adef6e5fa19b0 (patch) | |
| tree | e2591410f2bf9430446a3b3c0e60d6f09259ea1f | |
| parent | 957b5cf3cdaa99b6eb4e5a5753e9d0c02a14dda7 (diff) | |
| download | zsh-781711e7331b79dddfe890b8bc4adef6e5fa19b0.tar.gz zsh-781711e7331b79dddfe890b8bc4adef6e5fa19b0.tar.xz zsh-781711e7331b79dddfe890b8bc4adef6e5fa19b0.zip | |
- One minor change to handle the ZLE_STRING_T change.
- A few brace-position twiddles.
| -rw-r--r-- | Src/Zle/zle_utils.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/Src/Zle/zle_utils.c b/Src/Zle/zle_utils.c index b5f9884a9..8f1f647ae 100644 --- a/Src/Zle/zle_utils.c +++ b/Src/Zle/zle_utils.c @@ -68,8 +68,7 @@ sizeline(int sz) { int cursz = (zlemetaline != NULL) ? metalinesz : linesz; - while (sz > cursz) - { + while (sz > cursz) { if (cursz < 256) cursz = 256; else @@ -170,7 +169,7 @@ zlelineasstring(ZLE_STRING_T instr, int inll, int incs, int *outllp, #ifdef MULTIBYTE_SUPPORT unsigned char *strp = (unsigned char *)s; #else - unsigned char *strp = instr; + unsigned char *strp = (unsigned char *)instr; #endif unsigned char *stopcs = strp + outcs; unsigned char *stopll = strp + outll; @@ -190,8 +189,7 @@ zlelineasstring(ZLE_STRING_T instr, int inll, int incs, int *outllp, } #ifdef MULTIBYTE_SUPPORT - if (useheap) - { + if (useheap) { unsigned char *ret = (unsigned char *) metafy((char *) s, mb_len, META_HEAPDUP); @@ -199,10 +197,7 @@ zlelineasstring(ZLE_STRING_T instr, int inll, int incs, int *outllp, return ret; } - else - { - return (unsigned char *) metafy((char *) s, mb_len, META_REALLOC); - } + return (unsigned char *) metafy((char *) s, mb_len, META_REALLOC); #else return (unsigned char *) metafy((char *) instr, inll, useheap ? META_HEAPDUP : META_DUP); @@ -824,11 +819,8 @@ showmsg(char const *msg) n = nicechar(*p); ret = 1; width = strlen(n); - } - else - { + } else n = wcs_nicechar(c, &width, NULL); - } ulen -= ret; p += ret; |