[Trousers-scm] [GIT] Trousers master branch updated. TROUSERS_0_3_11-13-gad32caa

[Richard Maciel]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Trousers".

The branch, master has been updated
via ad32caabeac522bb42bb18eb1ac4e38480748d87 (commit)
from 5656124f3b873d233a9818efa4490866c7726a19 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://trousers.git.sourceforge.net/git/gitweb.cgi?p=trousers/trousers;a=commitdiff;h=ad32caabeac522bb42bb18eb1ac4e38480748d87

commit ad32caabeac522bb42bb18eb1ac4e38480748d87
Author: Richard Maciel <***@linux.vnet.ibm.com>
Date: Tue Oct 8 16:38:12 2013 -0300

Fixes warning msgs introduced by recent patch set

Patchset named "Changed underlying network code to better
support IPv6" (starts with commit
982c3ebe9d9a00284650a8745d3e8fb912f3d307 and ends with commit
5656124f3b873d233a9818efa4490866c7726a19) introduced three warning
messages. Two related to prototypes of new functions not being
declared in their header file and one related to a missing
typecast.

Signed-off-by: Richard Maciel <***@linux.vnet.ibm.com>
Acked-by: Joel Schopp <***@linux.vnet.ibm.com>

diff --git a/src/include/tsp_tcsi_param.h b/src/include/tsp_tcsi_param.h
index 1628250..bc000d4 100644
--- a/src/include/tsp_tcsi_param.h
+++ b/src/include/tsp_tcsi_param.h
@@ -17,3 +17,11 @@
#define HOSTNAME_ENV_VAR "TSS_TCSD_HOSTNAME"

#define TCP_PORT_STR_MAX_LEN 6
+
+/* Prototypes for functions which retrieve tcsd hostname and port
+ * information */
+TSS_RESULT
+get_tcsd_port(char port_str[TCP_PORT_STR_MAX_LEN]);
+
+TSS_RESULT
+get_tcsd_hostname(char **host_str, unsigned *len);
diff --git a/src/tspi/obj_context.c b/src/tspi/obj_context.c
index feb99ac..7bbd869 100644
--- a/src/tspi/obj_context.c
+++ b/src/tspi/obj_context.c
@@ -23,7 +23,7 @@
#include "capabilities.h"
#include "tsplog.h"
#include "obj.h"
-
+#include "tsp_tcsi_param.h"

TSS_RESULT
obj_context_add(TSS_HOBJECT *phObject)
@@ -41,7 +41,7 @@ obj_context_add(TSS_HOBJECT *phObject)
#else
context->silentMode = TSS_TSPATTRIB_CONTEXT_SILENT;
#endif
- if ((result = get_tcsd_hostname(&context->machineName,
+ if ((result = get_tcsd_hostname((char **)&context->machineName,
&context->machineNameLength)) != TSS_SUCCESS) {
free(context);
return result;

-----------------------------------------------------------------------

Summary of changes:
src/include/tsp_tcsi_param.h | 8 ++++++++
src/tspi/obj_context.c | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive