b43-fwcutter-patched/0003-fwcutter-Use-ARRAY_SIZE.patch

   1 From 37164fe78406e201302ec8bd975698bec48183b9 Mon Sep 17 00:00:00 2001
   2 From: Michael Buesch <mb@bu3sch.de>
   3 Date: Fri, 21 Aug 2009 15:59:08 +0200
   4 Subject: [PATCH 3/3] fwcutter: Use ARRAY_SIZE
   5
   6 Signed-off-by: Michael Buesch <mb@bu3sch.de>
   7 ---
   8  fwcutter/fwcutter.c      |    6 +++---
   9  fwcutter/fwcutter.h      |    3 +++
  10  fwcutter/fwcutter_list.h |    8 ++++----
  11  3 files changed, 10 insertions(+), 7 deletions(-)
  12
  13 diff --git a/fwcutter/fwcutter.c b/fwcutter/fwcutter.c
  14 index 5d5aa80..0d82806 100644
  15 --- a/fwcutter/fwcutter.c
  16 +++ b/fwcutter/fwcutter.c
  17 @@ -462,10 +462,10 @@ static void print_supported_files(void)
  18                "<ID>\t"
  19                "<MD5 checksum>\n\n");
  20         /* print for legacy driver first */
  21 -       for (i = 0; i < FILES; i++)
  22 +       for (i = 0; i < ARRAY_SIZE(files); i++)
  23                 if (file_ok(&files[i]) && !(files[i].flags & FW_FLAG_V4))
  24                         print_file(&files[i]);
  25 -       for (i = 0; i < FILES; i++)
  26 +       for (i = 0; i < ARRAY_SIZE(files); i++)
  27                 if (file_ok(&files[i]) && files[i].flags & FW_FLAG_V4)
  28                         print_file(&files[i]);
  29         printf("\n");
  30 @@ -491,7 +491,7 @@ static const struct file *find_file(FILE *fd)
  31                  signature[8], signature[9], signature[10], signature[11],
  32                  signature[12], signature[13], signature[14], signature[15]);
  33
  34 -       for (i = 0; i < FILES; ++i) {
  35 +       for (i = 0; i < ARRAY_SIZE(files); i++) {
  36                 if (file_ok(&files[i]) &&
  37                     strcasecmp(md5sig, files[i].md5) == 0) {
  38                         printf("This file is recognised as:\n");
  39 diff --git a/fwcutter/fwcutter.h b/fwcutter/fwcutter.h
  40 index ac2df63..4a887b6 100644
  41 --- a/fwcutter/fwcutter.h
  42 +++ b/fwcutter/fwcutter.h
  43 @@ -9,6 +9,9 @@
  44  #define fwcutter_stringify(x)  fwcutter_stringify_1(x)
  45  #define FWCUTTER_VERSION       fwcutter_stringify(FWCUTTER_VERSION_)
  46
  47 +#undef ARRAY_SIZE
  48 +#define ARRAY_SIZE(array)      (sizeof(array) / sizeof((array)[0]))
  49 +
  50  typedef uint16_t be16_t; /* Big-endian 16bit */
  51  typedef uint32_t be32_t; /* Big-endian 32bit */
  52
  53 diff --git a/fwcutter/fwcutter_list.h b/fwcutter/fwcutter_list.h
  54 index 65c8671..5175bbd 100644
  55 --- a/fwcutter/fwcutter_list.h
  56 +++ b/fwcutter/fwcutter_list.h
  57 @@ -287,6 +287,7 @@ static struct extract _1a258b2d93efa641c32ddf3c3a962028[] =
  58         { .name = "sslpn0bsinitvals16", .offset = 0xAF048, .type = EXT_IV, .length = 0x0 },
  59         EXTRACT_LIST_END
  60  };
  61 +
  62  static struct extract _bb8537e3204a1ea5903fe3e66b5e2763[] =
  63  {
  64         /* ucode major version at offset 0xa8b70 */
  65 @@ -337,7 +338,9 @@ static struct extract _bb8537e3204a1ea5903fe3e66b5e2763[] =
  66         { .name = "sslpn0bsinitvals16", .offset = 0xB5348, .type = EXT_IV, .length = 0x0 },
  67         { .name = "lp0bsinitvals16", .offset = 0xB5FE8, .type = EXT_IV, .length = 0x118 },
  68         EXTRACT_LIST_END
  69 -};/*
  70 +};
  71 +
  72 +/*
  73   * Links change, so let's not put them into the README.
  74   * I still put them here so we know where the file was obtained.
  75   */
  76 @@ -417,6 +420,3 @@ static const struct file files[] =
  77                 .extract        = _bb8537e3204a1ea5903fe3e66b5e2763,
  78         },
  79  };
  80 -
  81 -#define FILES (sizeof(files) / sizeof(files[0]))
  82 -
  83 --
  84 1.6.4
  85