diff options
author | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 03:57:47 +0000 |
---|---|---|
committer | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 03:57:47 +0000 |
commit | 4f960dd75f181e9fa2edc44324f15f0ab5c64b37 (patch) | |
tree | 15a9c7203efd47ba6dde2896fdb6327dddd4547f /usr.sbin/vidcontrol | |
parent | 30ef9631c5eac7f8254bd3d7ad274d34d9f518b8 (diff) | |
download | FreeBSD-src-4f960dd75f181e9fa2edc44324f15f0ab5c64b37.zip FreeBSD-src-4f960dd75f181e9fa2edc44324f15f0ab5c64b37.tar.gz |
Remove trailing whitespace.
Diffstat (limited to 'usr.sbin/vidcontrol')
-rw-r--r-- | usr.sbin/vidcontrol/decode.c | 6 | ||||
-rw-r--r-- | usr.sbin/vidcontrol/vidcontrol.c | 28 |
2 files changed, 17 insertions, 17 deletions
diff --git a/usr.sbin/vidcontrol/decode.c b/usr.sbin/vidcontrol/decode.c index 38dd912..d1046c5 100644 --- a/usr.sbin/vidcontrol/decode.c +++ b/usr.sbin/vidcontrol/decode.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: decode.c,v 1.1 1994/08/17 09:00:09 sos Exp $ + * $Id: decode.c,v 1.2 1995/01/28 22:18:02 sos Exp $ */ #include <stdio.h> @@ -39,7 +39,7 @@ int decode(FILE *fd, char *buffer) #define DEC(c) (((c) - ' ') & 0x3f) do { - if (!fgets(temp, sizeof(temp), fd)) + if (!fgets(temp, sizeof(temp), fd)) return(0); } while (strncmp(temp, "begin ", 6)); sscanf(temp, "begin %o %s", &n, temp); @@ -60,7 +60,7 @@ int decode(FILE *fd, char *buffer) DEC(p[0])<<2 | DEC(p[1])>>4; } if (n >= 2) { - buffer[pos++] = + buffer[pos++] = DEC(p[1])<<4 | DEC(p[2])>>2; } if (n >= 3) { diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c index 786549f..bd56843 100644 --- a/usr.sbin/vidcontrol/vidcontrol.c +++ b/usr.sbin/vidcontrol/vidcontrol.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: vidcontrol.c,v 1.9 1995/02/22 13:41:27 sos Exp $ + * $Id: vidcontrol.c,v 1.10 1995/03/03 21:21:24 dima Exp $ */ #include <ctype.h> @@ -166,7 +166,7 @@ print_scrnmap() if (i > 0 && i % 16 == 0) fprintf(stdout, "\n"); if (hex) - fprintf(stdout, " %02x", map[i]); + fprintf(stdout, " %02x", map[i]); else fprintf(stdout, " %03d", map[i]); } @@ -174,7 +174,7 @@ print_scrnmap() } -void +void load_font(char *type, char *filename) { FILE *fd; @@ -255,7 +255,7 @@ set_cursor_type(char *appearence) else if (!strcmp(appearence, "destructive")) type = 3; else { - fprintf(stderr, + fprintf(stderr, "argument to -c must be normal, blink or destructive\n"); return; } @@ -292,7 +292,7 @@ video_mode(int argc, char **argv, int *index) } return; } - + int get_color_number(char *color) { @@ -312,8 +312,8 @@ set_normal_colors(int argc, char **argv, int *index) if (*index < argc && (color = get_color_number(argv[*index])) != -1) { (*index)++; fprintf(stderr, "[=%dF", color); - if (*index < argc - && (color = get_color_number(argv[*index])) != -1 + if (*index < argc + && (color = get_color_number(argv[*index])) != -1 && color < 8) { (*index)++; fprintf(stderr, "[=%dG", color); @@ -327,8 +327,8 @@ set_reverse_colors(int argc, char **argv, int *index) if ((color = get_color_number(argv[*(index)-1])) != -1) { fprintf(stderr, "[=%dH", color); - if (*index < argc - && (color = get_color_number(argv[*index])) != -1 + if (*index < argc + && (color = get_color_number(argv[*index])) != -1 && color < 8) { (*index)++; fprintf(stderr, "[=%dI", color); @@ -344,7 +344,7 @@ set_border_color(char *arg) fprintf(stderr, "[=%dA", color); } else - usage(); + usage(); } test_frame() @@ -356,11 +356,11 @@ test_frame() fprintf(stdout, "[=15F[=0G %2d [=%dF%-16s" "[=15F[=0G %2d [=%dF%-16s " "[=15F %2d [=%dGBACKGROUND[=0G\n", - i, i, legal_colors[i], i+8, i+8, - legal_colors[i+8], i, i); + i, i, legal_colors[i], i+8, i+8, + legal_colors[i+8], i, i); } fprintf(stdout, "[=%dF[=%dG[=%dH[=%dI\n", - info.mv_norm.fore, info.mv_norm.back, + info.mv_norm.fore, info.mv_norm.back, info.mv_rev.fore, info.mv_rev.back); } @@ -371,7 +371,7 @@ main(int argc, char **argv) extern int optind; int opt; - + info.size = sizeof(info); if (ioctl(0, CONS_GETINFO, &info) < 0) { perror("Must be on a virtual console"); |