diff options
Diffstat (limited to 'loadacm.c')
-rw-r--r-- | loadacm.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -39,12 +39,12 @@ int loadacm_main(int argc, char **argv) | |||
39 | 39 | ||
40 | fd = open("/dev/tty", O_RDWR); | 40 | fd = open("/dev/tty", O_RDWR); |
41 | if (fd < 0) { | 41 | if (fd < 0) { |
42 | errorMsg("Error opening /dev/tty1: %s\n", strerror(errno)); | 42 | error_msg("Error opening /dev/tty1: %s\n", strerror(errno)); |
43 | return EXIT_FAILURE; | 43 | return EXIT_FAILURE; |
44 | } | 44 | } |
45 | 45 | ||
46 | if (screen_map_load(fd, stdin)) { | 46 | if (screen_map_load(fd, stdin)) { |
47 | errorMsg("Error loading acm: %s\n", strerror(errno)); | 47 | error_msg("Error loading acm: %s\n", strerror(errno)); |
48 | return EXIT_FAILURE; | 48 | return EXIT_FAILURE; |
49 | } | 49 | } |
50 | 50 | ||
@@ -72,7 +72,7 @@ int screen_map_load(int fd, FILE * fp) | |||
72 | if (parse_failed) { | 72 | if (parse_failed) { |
73 | if (-1 == fseek(fp, 0, SEEK_SET)) { | 73 | if (-1 == fseek(fp, 0, SEEK_SET)) { |
74 | if (errno == ESPIPE) | 74 | if (errno == ESPIPE) |
75 | errorMsg("16bit screen-map MUST be a regular file.\n"), | 75 | error_msg("16bit screen-map MUST be a regular file.\n"), |
76 | exit(1); | 76 | exit(1); |
77 | else | 77 | else |
78 | perror("fseek failed reading binary 16bit screen-map"), | 78 | perror("fseek failed reading binary 16bit screen-map"), |
@@ -83,7 +83,7 @@ int screen_map_load(int fd, FILE * fp) | |||
83 | perror("Cannot read [new] map from file"), exit(1); | 83 | perror("Cannot read [new] map from file"), exit(1); |
84 | #if 0 | 84 | #if 0 |
85 | else | 85 | else |
86 | errorMsg("Input screen-map is binary.\n"); | 86 | error_msg("Input screen-map is binary.\n"); |
87 | #endif | 87 | #endif |
88 | } | 88 | } |
89 | 89 | ||
@@ -100,7 +100,7 @@ int screen_map_load(int fd, FILE * fp) | |||
100 | /* rewind... */ | 100 | /* rewind... */ |
101 | if (-1 == fseek(fp, 0, SEEK_SET)) { | 101 | if (-1 == fseek(fp, 0, SEEK_SET)) { |
102 | if (errno == ESPIPE) | 102 | if (errno == ESPIPE) |
103 | errorMsg("Assuming 8bit screen-map - MUST be a regular file.\n"), | 103 | error_msg("Assuming 8bit screen-map - MUST be a regular file.\n"), |
104 | exit(1); | 104 | exit(1); |
105 | else | 105 | else |
106 | perror("fseek failed assuming 8bit screen-map"), exit(1); | 106 | perror("fseek failed assuming 8bit screen-map"), exit(1); |
@@ -113,7 +113,7 @@ int screen_map_load(int fd, FILE * fp) | |||
113 | if (-1 == fseek(fp, 0, SEEK_SET)) { | 113 | if (-1 == fseek(fp, 0, SEEK_SET)) { |
114 | if (errno == ESPIPE) | 114 | if (errno == ESPIPE) |
115 | /* should not - it succedeed above */ | 115 | /* should not - it succedeed above */ |
116 | errorMsg("fseek() returned ESPIPE !\n"), | 116 | error_msg("fseek() returned ESPIPE !\n"), |
117 | exit(1); | 117 | exit(1); |
118 | else | 118 | else |
119 | perror("fseek for binary 8bit screen-map"), exit(1); | 119 | perror("fseek for binary 8bit screen-map"), exit(1); |
@@ -123,7 +123,7 @@ int screen_map_load(int fd, FILE * fp) | |||
123 | perror("Cannot read [old] map from file"), exit(1); | 123 | perror("Cannot read [old] map from file"), exit(1); |
124 | #if 0 | 124 | #if 0 |
125 | else | 125 | else |
126 | errorMsg("Input screen-map is binary.\n"); | 126 | error_msg("Input screen-map is binary.\n"); |
127 | #endif | 127 | #endif |
128 | } | 128 | } |
129 | 129 | ||
@@ -132,7 +132,7 @@ int screen_map_load(int fd, FILE * fp) | |||
132 | else | 132 | else |
133 | return 0; | 133 | return 0; |
134 | } | 134 | } |
135 | errorMsg("Error parsing symbolic map\n"); | 135 | error_msg("Error parsing symbolic map\n"); |
136 | return(1); | 136 | return(1); |
137 | } | 137 | } |
138 | 138 | ||