commit c9c7cd50640c2d8882a04f59f1bcb383a88b19e9
author Yunlian Jiang <yunlian@google.com> Mon Jun 24 17:02:58 2013
committer ChromeBot <chrome-bot@google.com> Tue Jun 25 22:32:09 2013
tree 1b32bdab2c3b4239aa23b92a6ff7ac8af3e2b0f7
parent e3afe51c44ea5b1ebbc6fc6561c46fd0608cde2a

trousers: remove inline keyword from two functions.

Inline functions only make sense when you put them in a ".h" file.
The whole concept is about making the function definition visible
to all callers.

This patch removes the inline keyword from function read_data and
write_data because they are in .c file and they are used by other
c files.

BUG=chromium:253557
TEST=FEATURES="TEST" emerge-lumpy trousers passes.

Change-Id: I04149e41a60bc9487636a7d758a1fd3f34a105b5
Reviewed-on: https://gerrit.chromium.org/gerrit/59794
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>
Reviewed-by: Darren Krahn <dkrahn@chromium.org>
Commit-Queue: Yunlian Jiang <yunlian@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>

src/include/tcsps.h

diff --git a/src/include/tcsps.h b/src/include/tcsps.h
index 8754296..ef3358a 100644
--- a/src/include/tcsps.h
+++ b/src/include/tcsps.h
@@ -23,13 +23,6 @@
 int		   put_file(int);
 void		   close_file(int);
 void		   ps_destroy();
-#ifdef SOLARIS
-TSS_RESULT  read_data(int, void *, UINT32);
-TSS_RESULT  write_data(int, void *, UINT32);
-#else
-inline TSS_RESULT  read_data(int, void *, UINT32);
-inline TSS_RESULT  write_data(int, void *, UINT32);
-#endif
 int		   write_key_init(int, UINT32, UINT32, UINT32);
 TSS_RESULT	   cache_key(UINT32, UINT16, TSS_UUID *, TSS_UUID *, UINT16, UINT32, UINT32);
 TSS_RESULT	   UnloadBlob_KEY_PS(UINT16 *, BYTE *, TSS_KEY *);

src/include/tspps.h

diff --git a/src/include/tspps.h b/src/include/tspps.h
index 17b0aab..00bcfae 100644
--- a/src/include/tspps.h
+++ b/src/include/tspps.h
@@ -18,8 +18,8 @@
 
 TSS_RESULT	   get_file(int *);
 int		   put_file(int);
-inline TSS_RESULT  read_data(int, void *, UINT32);
-inline TSS_RESULT  write_data(int, void *, UINT32);
+TSS_RESULT	   read_data(int, void *, UINT32);
+TSS_RESULT	   write_data(int, void *, UINT32);
 UINT32		   psfile_get_num_keys(int);
 TSS_RESULT	   psfile_get_parent_uuid_by_uuid(int, TSS_UUID *, TSS_UUID *);
 TSS_RESULT	   psfile_remove_key_by_uuid(int, TSS_UUID *);

src/tcs/ps/ps_utils.c

diff --git a/src/tcs/ps/ps_utils.c b/src/tcs/ps/ps_utils.c
index 82838ab..1cbc1ce 100644
--- a/src/tcs/ps/ps_utils.c
+++ b/src/tcs/ps/ps_utils.c
@@ -42,11 +42,7 @@
 struct key_disk_cache *key_disk_cache_head = NULL;
 
 
-#ifdef SOLARIS
 TSS_RESULT
-#else
-inline TSS_RESULT
-#endif
 read_data(int fd, void *data, UINT32 size)
 {
 	int rc;
@@ -64,11 +60,7 @@
 }
 
 
-#ifdef SOLARIS
 TSS_RESULT
-#else
-inline TSS_RESULT
-#endif
 write_data(int fd, void *data, UINT32 size)
 {
 	int rc;