package/trousers/0001-Remove-inline-for-read_data-and-write_data.patch

   1 From f03c7987c234a81f7e4274b26bab07318357a2a5 Mon Sep 17 00:00:00 2001
   2 From: Sergio Prado <sergio.prado@e-labworks.com>
   3 Date: Fri, 25 Dec 2015 20:09:21 -0200
   4 Subject: [PATCH] Remove inline for read_data and write_data
   5
   6 read_data and write_data functions are declared with inline, but
   7 their definition is not in a .h file. This is causing errors when
   8 linking:
   9
  10 tcsps.c:(.text+0x4ac): undefined reference to `read_data'
  11 tcsps.c:(.text+0x1888): undefined reference to `write_data'
  12 ...
  13
  14 Partial backport of upstream commit
  15 3297fcdf5ac0df868778e976b8b59e35542c1ee2.
  16
  17 Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
  18 ---
  19  src/include/tcsps.h    | 5 -----
  20  src/tcs/ps/ps_utils.c  | 8 --------
  21  src/tspi/ps/ps_utils.c | 4 ++--
  22  3 files changed, 2 insertions(+), 15 deletions(-)
  23
  24 diff --git a/src/include/tcsps.h b/src/include/tcsps.h
  25 index 87542965877d..dcd5db469822 100644
  26 --- a/src/include/tcsps.h
  27 +++ b/src/include/tcsps.h
  28 @@ -23,13 +23,8 @@ int             get_file();
  29  int               put_file(int);
  30  void              close_file(int);
  31  void              ps_destroy();
  32 -#ifdef SOLARIS
  33  TSS_RESULT  read_data(int, void *, UINT32);
  34  TSS_RESULT  write_data(int, void *, UINT32);
  35 -#else
  36 -inline TSS_RESULT  read_data(int, void *, UINT32);
  37 -inline TSS_RESULT  write_data(int, void *, UINT32);
  38 -#endif
  39  int               write_key_init(int, UINT32, UINT32, UINT32);
  40  TSS_RESULT        cache_key(UINT32, UINT16, TSS_UUID *, TSS_UUID *, UINT16, UINT32, UINT32);
  41  TSS_RESULT        UnloadBlob_KEY_PS(UINT16 *, BYTE *, TSS_KEY *);
  42 diff --git a/src/tcs/ps/ps_utils.c b/src/tcs/ps/ps_utils.c
  43 index 2e7f502b9599..35ac89f8fc12 100644
  44 --- a/src/tcs/ps/ps_utils.c
  45 +++ b/src/tcs/ps/ps_utils.c
  46 @@ -42,11 +42,7 @@
  47  struct key_disk_cache *key_disk_cache_head = NULL;
  48
  49
  50 -#ifdef SOLARIS
  51  TSS_RESULT
  52 -#else
  53 -inline TSS_RESULT
  54 -#endif
  55  read_data(int fd, void *data, UINT32 size)
  56  {
  57         int rc;
  58 @@ -64,11 +60,7 @@ read_data(int fd, void *data, UINT32 size)
  59  }
  60
  61
  62 -#ifdef SOLARIS
  63  TSS_RESULT
  64 -#else
  65 -inline TSS_RESULT
  66 -#endif
  67  write_data(int fd, void *data, UINT32 size)
  68  {
  69         int rc;
  70 diff --git a/src/tspi/ps/ps_utils.c b/src/tspi/ps/ps_utils.c
  71 index aac40a147314..83259141d375 100644
  72 --- a/src/tspi/ps/ps_utils.c
  73 +++ b/src/tspi/ps/ps_utils.c
  74 @@ -22,7 +22,7 @@
  75  #include "tspps.h"
  76  #include "tsplog.h"
  77
  78 -inline TSS_RESULT
  79 +TSS_RESULT
  80  read_data(int fd, void *data, UINT32 size)
  81  {
  82         int rc;
  83 @@ -39,7 +39,7 @@ read_data(int fd, void *data, UINT32 size)
  84         return TSS_SUCCESS;
  85  }
  86
  87 -inline TSS_RESULT
  88 +TSS_RESULT
  89  write_data(int fd, void *data, UINT32 size)
  90  {
  91         int rc;
  92 --
  93 1.9.1
  94