projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MX5: mx51evk: use new pmic driver
[oweals/u-boot.git]
/
tools
/
bmp_logo.c
diff --git
a/tools/bmp_logo.c
b/tools/bmp_logo.c
index 98be6176675fbd0bba6baf14b8f5ceee6139f388..47228d255b344a755790f7cfdcbe6e27246cea86 100644
(file)
--- a/
tools/bmp_logo.c
+++ b/
tools/bmp_logo.c
@@
-1,15
+1,4
@@
-#include <stdio.h>
-#include <stdlib.h>
-
-#if defined(__linux__)
-#include <stdint.h>
-#else
-#ifdef __CYGWIN__
-#include "elf.h"
-#else
-#include <inttypes.h>
-#endif
-#endif
+#include "compiler.h"
typedef struct bitmap_s { /* bitmap description */
uint16_t width;
typedef struct bitmap_s { /* bitmap description */
uint16_t width;
@@
-40,6
+29,16
@@
void skip_bytes (FILE *fp, int n)
fgetc (fp);
}
fgetc (fp);
}
+__attribute__ ((__noreturn__))
+int error (char * msg, FILE *fp)
+{
+ fprintf (stderr, "ERROR: %s\n", msg);
+
+ fclose (fp);
+
+ exit (EXIT_FAILURE);
+}
+
int main (int argc, char *argv[])
{
int i, x;
int main (int argc, char *argv[])
{
int i, x;
@@
-58,23
+57,25
@@
int main (int argc, char *argv[])
exit (EXIT_FAILURE);
}
exit (EXIT_FAILURE);
}
- if (fgetc (fp) != 'B' || fgetc (fp) != 'M') {
- fprintf (stderr, "%s is not a bitmap file.\n", argv[1]);
- exit (EXIT_FAILURE);
- }
+ if (fgetc (fp) != 'B' || fgetc (fp) != 'M')
+ error ("Input file is not a bitmap", fp);
/*
* read width and height of the image, and the number of colors used;
* ignore the rest
*/
skip_bytes (fp, 8);
/*
* read width and height of the image, and the number of colors used;
* ignore the rest
*/
skip_bytes (fp, 8);
- fread (&data_offset, sizeof (uint16_t), 1, fp);
+ if (fread (&data_offset, sizeof (uint16_t), 1, fp) != 1)
+ error ("Couldn't read bitmap data offset", fp);
skip_bytes (fp, 6);
skip_bytes (fp, 6);
- fread (&b->width, sizeof (uint16_t), 1, fp);
+ if (fread (&b->width, sizeof (uint16_t), 1, fp) != 1)
+ error ("Couldn't read bitmap width", fp);
skip_bytes (fp, 2);
skip_bytes (fp, 2);
- fread (&b->height, sizeof (uint16_t), 1, fp);
+ if (fread (&b->height, sizeof (uint16_t), 1, fp) != 1)
+ error ("Couldn't read bitmap height", fp);
skip_bytes (fp, 22);
skip_bytes (fp, 22);
- fread (&n_colors, sizeof (uint16_t), 1, fp);
+ if (fread (&n_colors, sizeof (uint16_t), 1, fp) != 1)
+ error ("Couldn't read bitmap colors", fp);
skip_bytes (fp, 6);
/*
skip_bytes (fp, 6);
/*
@@
-108,11
+109,8
@@
int main (int argc, char *argv[])
DEFAULT_CMAP_SIZE);
/* allocate memory */
DEFAULT_CMAP_SIZE);
/* allocate memory */
- if ((b->data = (uint8_t *)malloc(b->width * b->height)) == NULL) {
- fclose (fp);
- printf ("Error allocating memory for file %s.\n", argv[1]);
- exit (EXIT_FAILURE);
- }
+ if ((b->data = (uint8_t *)malloc(b->width * b->height)) == NULL)
+ error ("Error allocating memory for file", fp);
/* read and print the palette information */
printf ("unsigned short bmp_logo_palette[] = {\n");
/* read and print the palette information */
printf ("unsigned short bmp_logo_palette[] = {\n");