0006-Remove-duplicate-consts-declaration-specifiers.patch 1.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364
  1. From 48acbee142ed1712ecdd4e5338f2a2d46bfbb1f3 Mon Sep 17 00:00:00 2001
  2. From: Andrew Robbins <contact@andrewrobbins.info>
  3. Date: Thu, 15 Nov 2018 18:43:07 -0500
  4. Subject: [PATCH] Remove duplicate consts declaration specifiers
  5. ---
  6. util/comm-dev.c | 2 +-
  7. util/ectool.c | 2 +-
  8. util/lbcc.c | 6 +++---
  9. 3 files changed, 5 insertions(+), 5 deletions(-)
  10. diff --git a/util/comm-dev.c b/util/comm-dev.c
  11. index cdbbbdf..0fb4027 100644
  12. --- a/util/comm-dev.c
  13. +++ b/util/comm-dev.c
  14. @@ -23,7 +23,7 @@ static int fd = -1;
  15. #define ARRAY_SIZE(t) (sizeof(t) / sizeof(t[0]))
  16. #endif
  17. -static const char const *meanings[] = {
  18. +static const char *meanings[] = {
  19. "SUCCESS",
  20. "INVALID_COMMAND",
  21. "ERROR",
  22. diff --git a/util/ectool.c b/util/ectool.c
  23. index 9ba8de9..74e6366 100644
  24. --- a/util/ectool.c
  25. +++ b/util/ectool.c
  26. @@ -5199,7 +5199,7 @@ static int cmd_tmp006cal_v1(int idx, int argc, char *argv[])
  27. int i, rv, cmdsize;
  28. /* Algorithm 1 parameter names */
  29. - static const char const *alg1_pname[] = {
  30. + static const char *alg1_pname[] = {
  31. "s0", "a1", "a2", "b0", "b1", "b2", "c2",
  32. "d0", "d1", "ds", "e0", "e1",
  33. };
  34. diff --git a/util/lbcc.c b/util/lbcc.c
  35. index b34b21e..eb8a7e1 100644
  36. --- a/util/lbcc.c
  37. +++ b/util/lbcc.c
  38. @@ -81,15 +81,15 @@ static const int num_operands[] = {
  39. #define OP(NAME, BYTES, MNEMONIC) MNEMONIC,
  40. #include "lightbar_opcode_list.h"
  41. -static const char const *opcode_sym[] = {
  42. +static const char *opcode_sym[] = {
  43. LIGHTBAR_OPCODE_TABLE
  44. };
  45. #undef OP
  46. -static const char const *control_sym[] = {
  47. +static const char *control_sym[] = {
  48. "beg", "end", "phase", "<invalid>"
  49. };
  50. -static const char const *color_sym[] = {
  51. +static const char *color_sym[] = {
  52. "r", "g", "b", "<invalid>"
  53. };
  54. --
  55. 2.7.4