[src/trunk]: src/crypto/external/cpl/trousers/dist/src don't inline functions...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2781c1c3bcce
branches:  trunk
changeset: 773097:2781c1c3bcce
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 28 02:03:41 2012 +0000

description:
don't inline functions whose body is not visible in all places used.

diffstat:

 crypto/external/cpl/trousers/dist/src/include/tcsps.h    |  9 ++-------
 crypto/external/cpl/trousers/dist/src/include/tspps.h    |  4 ++--
 crypto/external/cpl/trousers/dist/src/tspi/ps/ps_utils.c |  4 ++--
 3 files changed, 6 insertions(+), 11 deletions(-)

diffs (54 lines):

diff -r d1db4680b2ec -r 2781c1c3bcce crypto/external/cpl/trousers/dist/src/include/tcsps.h
--- a/crypto/external/cpl/trousers/dist/src/include/tcsps.h     Sat Jan 28 02:00:51 2012 +0000
+++ b/crypto/external/cpl/trousers/dist/src/include/tcsps.h     Sat Jan 28 02:03:41 2012 +0000
@@ -23,13 +23,8 @@
 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
+TSS_RESULT         read_data(int, void *, UINT32);
+TSS_RESULT         write_data(int, void *, UINT32);
 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 *);
diff -r d1db4680b2ec -r 2781c1c3bcce crypto/external/cpl/trousers/dist/src/include/tspps.h
--- a/crypto/external/cpl/trousers/dist/src/include/tspps.h     Sat Jan 28 02:00:51 2012 +0000
+++ b/crypto/external/cpl/trousers/dist/src/include/tspps.h     Sat Jan 28 02:03:41 2012 +0000
@@ -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 *);
diff -r d1db4680b2ec -r 2781c1c3bcce crypto/external/cpl/trousers/dist/src/tspi/ps/ps_utils.c
--- a/crypto/external/cpl/trousers/dist/src/tspi/ps/ps_utils.c  Sat Jan 28 02:00:51 2012 +0000
+++ b/crypto/external/cpl/trousers/dist/src/tspi/ps/ps_utils.c  Sat Jan 28 02:03:41 2012 +0000
@@ -22,7 +22,7 @@
 #include "tspps.h"
 #include "tsplog.h"
 
-inline TSS_RESULT
+TSS_RESULT
 read_data(int fd, void *data, UINT32 size)
 {
        int rc;
@@ -39,7 +39,7 @@
        return TSS_SUCCESS;
 }
 
-inline TSS_RESULT
+TSS_RESULT
 write_data(int fd, void *data, UINT32 size)
 {
        int rc;