aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-10-18 11:11:49 +0000
committerWolfgang Denk <wd@denx.de>2011-10-22 01:13:35 +0200
commit712fbcf384b7fbe6118325f21dad98150b24f13b (patch)
tree38db6246dcd8d5f3ec59692d37a6bc83d4b0be3d /tools
parent83c484d7ecb62a9dfe8adb0da9a04cfb8bbb478b (diff)
downloadu-boot-linaro-stable-712fbcf384b7fbe6118325f21dad98150b24f13b.tar.gz
checkpatch whitespace cleanups
This avoids the following checkpatch warning in later patches: ERROR: "(foo*)" should be "(foo *)" ERROR: space required before the open brace '{' ERROR: space prohibited before that close parenthesis ')' ERROR: spaces required around that '||' (ctx:WxV) WARNING: space prohibited between function name and open parenthesis '(' WARNING: line over 80 characters This fixes all the white-space warnings/errors in my subsequent patch, and within this current patch. A number of other checkpatch warnings and errors are still present in this patch itself, but are beyond simple whitespace fixes, so are not solved by this patch. v2: New patch Signed-off-by: Stephen Warren <swarren@nvidia.com> Tested-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/default_image.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/tools/default_image.c b/tools/default_image.c
index f5bad4757..6ea3b462c 100644
--- a/tools/default_image.c
+++ b/tools/default_image.c
@@ -33,7 +33,7 @@
static image_header_t header;
-static int image_check_image_types (uint8_t type)
+static int image_check_image_types(uint8_t type)
{
if ((type > IH_TYPE_INVALID) && (type < IH_TYPE_FLATDT))
return EXIT_SUCCESS;
@@ -41,14 +41,14 @@ static int image_check_image_types (uint8_t type)
return EXIT_FAILURE;
}
-static int image_check_params (struct mkimage_params *params)
+static int image_check_params(struct mkimage_params *params)
{
return ((params->dflag && (params->fflag || params->lflag)) ||
(params->fflag && (params->dflag || params->lflag)) ||
(params->lflag && (params->dflag || params->fflag)));
}
-static int image_verify_header (unsigned char *ptr, int image_size,
+static int image_verify_header(unsigned char *ptr, int image_size,
struct mkimage_params *params)
{
uint32_t len;
@@ -62,10 +62,10 @@ static int image_verify_header (unsigned char *ptr, int image_size,
* checksum field for checking - this can't be done
* on the PROT_READ mapped data.
*/
- memcpy (hdr, ptr, sizeof(image_header_t));
+ memcpy(hdr, ptr, sizeof(image_header_t));
if (be32_to_cpu(hdr->ih_magic) != IH_MAGIC) {
- fprintf (stderr,
+ fprintf(stderr,
"%s: Bad Magic Number: \"%s\" is no valid image\n",
params->cmdname, params->imagefile);
return -FDT_ERR_BADMAGIC;
@@ -77,8 +77,8 @@ static int image_verify_header (unsigned char *ptr, int image_size,
checksum = be32_to_cpu(hdr->ih_hcrc);
hdr->ih_hcrc = cpu_to_be32(0); /* clear for re-calculation */
- if (crc32 (0, data, len) != checksum) {
- fprintf (stderr,
+ if (crc32(0, data, len) != checksum) {
+ fprintf(stderr,
"%s: ERROR: \"%s\" has bad header checksum!\n",
params->cmdname, params->imagefile);
return -FDT_ERR_BADSTATE;
@@ -88,8 +88,8 @@ static int image_verify_header (unsigned char *ptr, int image_size,
len = image_size - sizeof(image_header_t) ;
checksum = be32_to_cpu(hdr->ih_dcrc);
- if (crc32 (0, data, len) != checksum) {
- fprintf (stderr,
+ if (crc32(0, data, len) != checksum) {
+ fprintf(stderr,
"%s: ERROR: \"%s\" has corrupted data!\n",
params->cmdname, params->imagefile);
return -FDT_ERR_BADSTRUCTURE;
@@ -97,36 +97,36 @@ static int image_verify_header (unsigned char *ptr, int image_size,
return 0;
}
-static void image_set_header (void *ptr, struct stat *sbuf, int ifd,
+static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
struct mkimage_params *params)
{
uint32_t checksum;
image_header_t * hdr = (image_header_t *)ptr;
- checksum = crc32 (0,
+ checksum = crc32(0,
(const unsigned char *)(ptr +
sizeof(image_header_t)),
sbuf->st_size - sizeof(image_header_t));
/* Build new header */
- image_set_magic (hdr, IH_MAGIC);
- image_set_time (hdr, sbuf->st_mtime);
- image_set_size (hdr, sbuf->st_size - sizeof(image_header_t));
- image_set_load (hdr, params->addr);
- image_set_ep (hdr, params->ep);
- image_set_dcrc (hdr, checksum);
- image_set_os (hdr, params->os);
- image_set_arch (hdr, params->arch);
- image_set_type (hdr, params->type);
- image_set_comp (hdr, params->comp);
-
- image_set_name (hdr, params->imagename);
-
- checksum = crc32 (0, (const unsigned char *)hdr,
+ image_set_magic(hdr, IH_MAGIC);
+ image_set_time(hdr, sbuf->st_mtime);
+ image_set_size(hdr, sbuf->st_size - sizeof(image_header_t));
+ image_set_load(hdr, params->addr);
+ image_set_ep(hdr, params->ep);
+ image_set_dcrc(hdr, checksum);
+ image_set_os(hdr, params->os);
+ image_set_arch(hdr, params->arch);
+ image_set_type(hdr, params->type);
+ image_set_comp(hdr, params->comp);
+
+ image_set_name(hdr, params->imagename);
+
+ checksum = crc32(0, (const unsigned char *)hdr,
sizeof(image_header_t));
- image_set_hcrc (hdr, checksum);
+ image_set_hcrc(hdr, checksum);
}
/*
@@ -143,7 +143,7 @@ static struct image_type_params defimage_params = {
.check_params = image_check_params,
};
-void init_default_image_type (void)
+void init_default_image_type(void)
{
- mkimage_register (&defimage_params);
+ mkimage_register(&defimage_params);
}