diff options
author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
---|---|---|
committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
commit | 02d7aa8915f9c3a3288dab01f321eb94ba219e3b (patch) | |
tree | f053238978479e408a2b83571443e132f30586ab /src/lib9/utf | |
parent | c0c9d8f883dfd3a7f5a74499d91bb95884b15873 (diff) | |
parent | 3d1382b98a502d0c34d5ba2c462396acc515016e (diff) | |
download | plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.gz plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.bz2 plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/lib9/utf')
-rw-r--r-- | src/lib9/utf/lib9.h | 1 | ||||
-rw-r--r-- | src/lib9/utf/plan9.h | 1 | ||||
-rw-r--r-- | src/lib9/utf/rune.c | 2 | ||||
-rw-r--r-- | src/lib9/utf/runestrdup.c | 4 | ||||
-rw-r--r-- | src/lib9/utf/utfdef.h | 1 |
5 files changed, 3 insertions, 6 deletions
diff --git a/src/lib9/utf/lib9.h b/src/lib9/utf/lib9.h index e6128ae4..450f28f0 100644 --- a/src/lib9/utf/lib9.h +++ b/src/lib9/utf/lib9.h @@ -14,4 +14,3 @@ typedef unsigned char uchar; typedef unsigned short ushort; typedef unsigned int uint; typedef unsigned long ulong; - diff --git a/src/lib9/utf/plan9.h b/src/lib9/utf/plan9.h index e40e33eb..1ca8ace7 100644 --- a/src/lib9/utf/plan9.h +++ b/src/lib9/utf/plan9.h @@ -26,4 +26,3 @@ typedef unsigned long ulong; #undef nelem #define nelem(x) (sizeof (x)/sizeof (x)[0]) - diff --git a/src/lib9/utf/rune.c b/src/lib9/utf/rune.c index f5944806..bb2d82cb 100644 --- a/src/lib9/utf/rune.c +++ b/src/lib9/utf/rune.c @@ -155,7 +155,7 @@ runetochar(char *str, Rune *rune) str[2] = Tx | (c & Maskx); return 3; } - + /* * four character sequence * 010000-1FFFFF => T4 Tx Tx Tx diff --git a/src/lib9/utf/runestrdup.c b/src/lib9/utf/runestrdup.c index 8170e7bc..4f9d6f42 100644 --- a/src/lib9/utf/runestrdup.c +++ b/src/lib9/utf/runestrdup.c @@ -18,8 +18,8 @@ #include "utf.h" Rune* -runestrdup(Rune *s) -{ +runestrdup(Rune *s) +{ Rune *ns; ns = malloc(sizeof(Rune)*(runestrlen(s) + 1)); diff --git a/src/lib9/utf/utfdef.h b/src/lib9/utf/utfdef.h index 1ff41813..1db7076d 100644 --- a/src/lib9/utf/utfdef.h +++ b/src/lib9/utf/utfdef.h @@ -30,4 +30,3 @@ typedef long long vlong; #undef nelem #define nelem ((void*)0) - |