aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEon S. Jeon <esjeon@lavabit.com>2013-08-05 16:37:59 -0400
committerRoberto E. Vargas Caballero <k0ga@shike2.com>2013-08-06 08:32:11 +0200
commit347a45c35299c94e97c976b6e1df383dc2b8fbda (patch)
tree073bfbefd6e2d9a7cb89ff5d3b68be0325769699
parent22eeda56b7c1532773343811dee1f76c0999d01c (diff)
downloadst-347a45c35299c94e97c976b6e1df383dc2b8fbda.tar.gz
Fix signess of tdefcolor
tdefcolor() returns -1 on error, while its return type is unsigned long. At the same time, line 1724 and 1731 are checking the positivity of its unsigned return value.
-rw-r--r--st.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/st.c b/st.c
index 9cdd969..1b01353 100644
--- a/st.c
+++ b/st.c
@@ -362,7 +362,7 @@ static void tsetdirtattr(int);
static void tsetmode(bool, bool, int *, int);
static void tfulldirt(void);
static void techo(char *, int);
-static ulong tdefcolor(int *, int *, int);
+static long tdefcolor(int *, int *, int);
static inline bool match(uint, uint);
static void ttynew(void);
static void ttyread(void);
@@ -1626,7 +1626,7 @@ tdeleteline(int n) {
tscrollup(term.c.y, n);
}
-ulong
+long
tdefcolor(int *attr, int *npar, int l) {
long idx = -1;
uint r, g, b;
@@ -1677,7 +1677,7 @@ tdefcolor(int *attr, int *npar, int l) {
void
tsetattr(int *attr, int l) {
int i;
- ulong idx;
+ long idx;
for(i = 0; i < l; i++) {
switch(attr[i]) {