emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fbset: shrink code a bit more

Browse Source
This commit is contained in:
Denis Vlasenko 2008-07-27 21:16:30 +00:00
parent 09f5ecfa47
commit 8d523cbcd7
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
util-linux/fbset.c
View File

@ -170,9 +170,9 @@ enum {
}; };
#endif #endif
static void ss(uint32_t *x, uint32_t flag, char *where, const char *what) static void ss(uint32_t *x, uint32_t flag, char *buf, const char *what)
{ {
if (strstr(where, what)) if (strstr(buf, what))
*x &= ~flag; *x &= ~flag;
else else
*x |= flag; *x |= flag;
@ -187,8 +187,7 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn,
char *p = buf; char *p = buf;
f = xfopen_for_read(fn); f = xfopen_for_read(fn);
while (!feof(f)) { while (fgets(buf, sizeof(buf), f)) {
fgets(buf, sizeof(buf), f);
p = strstr(buf, "mode "); p = strstr(buf, "mode ");
if (!p && !(p = strstr(buf, "mode\t"))) if (!p && !(p = strstr(buf, "mode\t")))
continue; continue;
@ -197,13 +196,13 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn,
continue; continue;
p += strlen(mode); p += strlen(mode);
if (!isspace(*p) && (*p != 0) && (*p != '"') if (!isspace(*p) && (*p != 0) && (*p != '"')
&& (*p != '\r') && (*p != '\n')) && (*p != '\r') && (*p != '\n')
) {
continue; /* almost, but not quite */ continue; /* almost, but not quite */
}
while (!feof(f)) { while (fgets(buf, sizeof(buf), f)) {
fgets(buf, sizeof(buf), f); if ((p = strstr(buf, "geometry "))) {
p = strstr(buf, "geometry ");
if (p) {
p += 9; p += 9;
/* FIXME: catastrophic on arches with 64bit ints */ /* FIXME: catastrophic on arches with 64bit ints */
sscanf(p, "%d %d %d %d %d", sscanf(p, "%d %d %d %d %d",
@ -245,22 +244,22 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn,
} }
#endif #endif
static inline void setmode(struct fb_var_screeninfo *base, static void setmode(struct fb_var_screeninfo *base,
struct fb_var_screeninfo *set) struct fb_var_screeninfo *set)
{ {
if ((int) set->xres > 0) if ((int32_t) set->xres > 0)
base->xres = set->xres; base->xres = set->xres;
if ((int) set->yres > 0) if ((int32_t) set->yres > 0)
base->yres = set->yres; base->yres = set->yres;
if ((int) set->xres_virtual > 0) if ((int32_t) set->xres_virtual > 0)
base->xres_virtual = set->xres_virtual; base->xres_virtual = set->xres_virtual;
if ((int) set->yres_virtual > 0) if ((int32_t) set->yres_virtual > 0)
base->yres_virtual = set->yres_virtual; base->yres_virtual = set->yres_virtual;
if ((int) set->bits_per_pixel > 0) if ((int32_t) set->bits_per_pixel > 0)
base->bits_per_pixel = set->bits_per_pixel; base->bits_per_pixel = set->bits_per_pixel;
} }
static inline void showmode(struct fb_var_screeninfo *v) static void showmode(struct fb_var_screeninfo *v)
{ {
double drate = 0, hrate = 0, vrate = 0; double drate = 0, hrate = 0, vrate = 0;
@ -290,12 +289,8 @@ static inline void showmode(struct fb_var_screeninfo *v)
v->blue.length, v->blue.offset, v->transp.length, v->transp.offset); v->blue.length, v->blue.offset, v->transp.length, v->transp.offset);
} }
#ifdef STANDALONE
int main(int argc, char **argv)
#else
int fbset_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int fbset_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int fbset_main(int argc, char **argv) int fbset_main(int argc, char **argv)
#endif
{ {
struct fb_var_screeninfo var, varset; struct fb_var_screeninfo var, varset;
int fh, i; int fh, i;