Module Name: src
Committed By: christos
Date: Sat Jan 28 02:03:41 UTC 2012
Modified Files:
src/crypto/external/cpl/trousers/dist/src/include: tcsps.h tspps.h
src/crypto/external/cpl/trousers/dist/src/tspi/ps: ps_utils.c
Log Message:
don't inline functions whose body is not visible in all places used.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/cpl/trousers/dist/src/include/tcsps.h \
src/crypto/external/cpl/trousers/dist/src/include/tspps.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/cpl/trousers/dist/src/tspi/ps/ps_utils.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/cpl/trousers/dist/src/include/tcsps.h
diff -u src/crypto/external/cpl/trousers/dist/src/include/tcsps.h:1.1.1.1 src/crypto/external/cpl/trousers/dist/src/include/tcsps.h:1.2
--- src/crypto/external/cpl/trousers/dist/src/include/tcsps.h:1.1.1.1 Fri Jan 27 20:36:45 2012
+++ src/crypto/external/cpl/trousers/dist/src/include/tcsps.h Fri Jan 27 21:03:41 2012
@@ -23,13 +23,8 @@ int get_file();
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 *);
Index: src/crypto/external/cpl/trousers/dist/src/include/tspps.h
diff -u src/crypto/external/cpl/trousers/dist/src/include/tspps.h:1.1.1.1 src/crypto/external/cpl/trousers/dist/src/include/tspps.h:1.2
--- src/crypto/external/cpl/trousers/dist/src/include/tspps.h:1.1.1.1 Fri Jan 27 20:36:43 2012
+++ src/crypto/external/cpl/trousers/dist/src/include/tspps.h Fri Jan 27 21:03:41 2012
@@ -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 *);
Index: src/crypto/external/cpl/trousers/dist/src/tspi/ps/ps_utils.c
diff -u src/crypto/external/cpl/trousers/dist/src/tspi/ps/ps_utils.c:1.1.1.1 src/crypto/external/cpl/trousers/dist/src/tspi/ps/ps_utils.c:1.2
--- src/crypto/external/cpl/trousers/dist/src/tspi/ps/ps_utils.c:1.1.1.1 Fri Jan 27 20:36:41 2012
+++ src/crypto/external/cpl/trousers/dist/src/tspi/ps/ps_utils.c Fri Jan 27 21:03:41 2012
@@ -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 @@ read_data(int fd, void *data, UINT32 siz
return TSS_SUCCESS;
}
-inline TSS_RESULT
+TSS_RESULT
write_data(int fd, void *data, UINT32 size)
{
int rc;
