aboutsummaryrefslogtreecommitdiff
path: root/st.c
diff options
context:
space:
mode:
authorChristoph Lohmann <20h@r-36.net>2015-07-10 14:30:37 +0200
committerChristoph Lohmann <20h@r-36.net>2015-07-10 14:30:37 +0200
commit684c72d05e54780c283c6580f271fb6920c3060d (patch)
treebf336e5dad62cf5e66b4117efd045874f33c2c7b /st.c
parentb823f57fa045bf8efa5648adbfeb0b6a7a9eb48b (diff)
downloadst-684c72d05e54780c283c6580f271fb6920c3060d.tar.gz
st-684c72d05e54780c283c6580f271fb6920c3060d.zip
Return style unification.
Diffstat (limited to 'st.c')
-rw-r--r--st.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/st.c b/st.c
index 4f958d8..c07cc3b 100644
--- a/st.c
+++ b/st.c
@@ -569,6 +569,7 @@ xwrite(int fd, const char *s, size_t len)
569 len -= r; 569 len -= r;
570 s += r; 570 s += r;
571 } 571 }
572
572 return aux; 573 return aux;
573} 574}
574 575
@@ -622,6 +623,7 @@ utf8decode(char *c, Rune *u, size_t clen)
622 return 0; 623 return 0;
623 *u = udecoded; 624 *u = udecoded;
624 utf8validate(u, len); 625 utf8validate(u, len);
626
625 return len; 627 return len;
626} 628}
627 629
@@ -631,6 +633,7 @@ utf8decodebyte(char c, size_t *i)
631 for (*i = 0; *i < LEN(utfmask); ++(*i)) 633 for (*i = 0; *i < LEN(utfmask); ++(*i))
632 if (((uchar)c & utfmask[*i]) == utfbyte[*i]) 634 if (((uchar)c & utfmask[*i]) == utfbyte[*i])
633 return (uchar)c & ~utfmask[*i]; 635 return (uchar)c & ~utfmask[*i];
636
634 return 0; 637 return 0;
635} 638}
636 639
@@ -642,11 +645,13 @@ utf8encode(Rune u, char *c)
642 len = utf8validate(&u, 0); 645 len = utf8validate(&u, 0);
643 if (len > UTF_SIZ) 646 if (len > UTF_SIZ)
644 return 0; 647 return 0;
648
645 for (i = len - 1; i != 0; --i) { 649 for (i = len - 1; i != 0; --i) {
646 c[i] = utf8encodebyte(u, 0); 650 c[i] = utf8encodebyte(u, 0);
647 u >>= 6; 651 u >>= 6;
648 } 652 }
649 c[0] = utf8encodebyte(u, len); 653 c[0] = utf8encodebyte(u, len);
654
650 return len; 655 return len;
651} 656}
652 657
@@ -669,6 +674,7 @@ utf8strchr(char *s, Rune u)
669 if (r == u) 674 if (r == u)
670 return &(s[i]); 675 return &(s[i]);
671 } 676 }
677
672 return NULL; 678 return NULL;
673} 679}
674 680
@@ -679,6 +685,7 @@ utf8validate(Rune *u, size_t i)
679 *u = UTF_INVALID; 685 *u = UTF_INVALID;
680 for (i = 1; *u > utfmax[i]; ++i) 686 for (i = 1; *u > utfmax[i]; ++i)
681 ; 687 ;
688
682 return i; 689 return i;
683} 690}
684 691
@@ -3127,6 +3134,7 @@ xloadcolor(int i, const char *name, Color *ncolor)
3127 } else 3134 } else
3128 name = colorname[i]; 3135 name = colorname[i];
3129 } 3136 }
3137
3130 return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor); 3138 return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
3131} 3139}
3132 3140
@@ -3166,6 +3174,7 @@ xsetcolorname(int x, const char *name)
3166 3174
3167 XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]); 3175 XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
3168 dc.col[x] = ncolor; 3176 dc.col[x] = ncolor;
3177
3169 return 0; 3178 return 0;
3170} 3179}
3171 3180
@@ -3235,6 +3244,7 @@ xgeommasktogravity(int mask)
3235 case YNegative: 3244 case YNegative:
3236 return SouthWestGravity; 3245 return SouthWestGravity;
3237 } 3246 }
3247
3238 return SouthEastGravity; 3248 return SouthEastGravity;
3239} 3249}
3240 3250