tonitch/st
1
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

Replace parse_int with atoi().

Browse Source
This commit is contained in:
Christoph Lohmann
2013-02-23 21:17:25 +01:00
parent 800800a3bb
commit 1b6c6535c1
1 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
st.c
View File

@ -302,7 +302,6 @@ static void execsh(void);
static void sigchld(int); static void sigchld(int);
static void run(void); static void run(void);
static inline int parse_int(char *);
static void csidump(void); static void csidump(void);
static void csihandle(void); static void csihandle(void);
static void csiparse(void); static void csiparse(void);
@ -941,7 +940,7 @@ brelease(XEvent *e) {
void void
bmotion(XEvent *e) { bmotion(XEvent *e) {
int oldey, oldex; int oldey, oldex, oldsby, oldsey;
if(IS_SET(MODE_MOUSE)) { if(IS_SET(MODE_MOUSE)) {
mousereport(e); mousereport(e);
@ -953,10 +952,12 @@ bmotion(XEvent *e) {
oldey = sel.ey; oldey = sel.ey;
oldex = sel.ex; oldex = sel.ex;
oldsby = sel.b.y;
oldsey = sel.e.y;
getbuttoninfo(e); getbuttoninfo(e);
if(oldey != sel.ey || oldex != sel.ex) { if(oldey != sel.ey || oldex != sel.ex) {
tsetdirt(sel.b.y, sel.e.y); tsetdirt(MIN(sel.b.y, oldsby), MAX(sel.e.y, oldsey));
} }
} }
@ -1857,22 +1858,6 @@ csireset(void) {
memset(&csiescseq, 0, sizeof(csiescseq)); memset(&csiescseq, 0, sizeof(csiescseq));
} }
inline int
parse_int(char *s) {
int x = 0;
char c;
while(isdigit(c = *s)) {
if((INT_MAX - c + '0') / 10 >= x) {
x = x * 10 + c - '0';
} else
return -1;
s++;
}
if(*s != '\0')
return -1;
return x;
}
void void
strhandle(void) { strhandle(void) {
char *p = NULL; char *p = NULL;
@ -1887,7 +1872,7 @@ strhandle(void) {
switch(strescseq.type) { switch(strescseq.type) {
case ']': /* OSC -- Operating System Command */ case ']': /* OSC -- Operating System Command */
switch(i = parse_int(strescseq.args[0])) { switch(i = atoi(strescseq.args[0])) {
case 0: case 0:
case 1: case 1:
case 2: case 2:
@ -1903,10 +1888,10 @@ strhandle(void) {
p = strescseq.args[2]; p = strescseq.args[2];
/* fall through */ /* fall through */
case 104: /* color reset, here p = NULL */ case 104: /* color reset, here p = NULL */
j = (narg > 1) ? parse_int(strescseq.args[1]) : -1; j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
if (!xsetcolorname(j, p)) if (!xsetcolorname(j, p)) {
fprintf(stderr, "erresc: invalid color %s\n", p); fprintf(stderr, "erresc: invalid color %s\n", p);
else { } else {
redraw(0); /* TODO if defaultbg color is changed, borders are dirty */ redraw(0); /* TODO if defaultbg color is changed, borders are dirty */
} }
break; break;