From 327f375e02d4282f973d0fb96e82b99858b32719 Mon Sep 17 00:00:00 2001
From: m0gg
Date: Wed, 6 Dec 2006 11:27:20 +0000
Subject: C++ style comments removed
---
libcsoap/soap-nhttp.c | 8 ++++----
libcsoap/soap-nudp.c | 6 +++---
libcsoap/soap-transport.c | 6 +++---
libcsoap/soap-xmlsec.c | 42 ++++++++++++++++++++----------------------
libcsoap/soap-xmlsec.h | 10 +++++-----
5 files changed, 35 insertions(+), 37 deletions(-)
(limited to 'libcsoap')
diff --git a/libcsoap/soap-nhttp.c b/libcsoap/soap-nhttp.c
index da30a11..22f78de 100644
--- a/libcsoap/soap-nhttp.c
+++ b/libcsoap/soap-nhttp.c
@@ -1,5 +1,5 @@
/******************************************************************
-* $Id: soap-nhttp.c,v 1.9 2006/12/03 17:30:57 m0gg Exp $
+* $Id: soap-nhttp.c,v 1.10 2006/12/06 11:27:20 m0gg Exp $
*
* CSOAP Project: A SOAP client/server library in C
* Copyright (C) 2003 Ferhat Ayaz
@@ -201,8 +201,8 @@ soap_nhttp_process(httpd_conn_t * conn, struct hrequest_t * req)
soap_ctx_add_files(ctx, req->attachments);
- /* only local part is interesting... */
- // soap_addressing_set_to_address_string(ctx->env, req->path);
+ /* only local part is interesting...
+ soap_addressing_set_to_address_string(ctx->env, req->path); */
soap_transport_process(ctx, &response);
@@ -284,7 +284,7 @@ _soap_nhttp_client_invoke(void *unused, struct SoapCtx *request, struct SoapCtx
xmlDocDumpMemory(request->env->root->doc, &buffer, &size);
- // xmlDocFormatDump(stdout, request->env->root->doc, 1);
+ /* xmlDocFormatDump(stdout, request->env->root->doc, 1); */
/* Transport via HTTP */
if (!(conn = httpc_new()))
diff --git a/libcsoap/soap-nudp.c b/libcsoap/soap-nudp.c
index fb4475d..60a7d25 100644
--- a/libcsoap/soap-nudp.c
+++ b/libcsoap/soap-nudp.c
@@ -1,5 +1,5 @@
/******************************************************************
-* $Id: soap-nudp.c,v 1.6 2006/11/29 11:04:25 m0gg Exp $
+* $Id: soap-nudp.c,v 1.7 2006/12/06 11:27:21 m0gg Exp $
*
* CSOAP Project: A SOAP client/server library in C
* Copyright (C) 2006 Heiko Ronsdorf
@@ -266,8 +266,8 @@ soap_nudp_server_run(void *unused)
_soap_nudp_receive_document(_soap_nudp_socket, &doc, &addr, &addr_len);
- // log_error1(__FUNCTION__);
- // xmlDocFormatDump(stdout, doc, 1);
+ /* log_error1(__FUNCTION__);
+ xmlDocFormatDump(stdout, doc, 1); */
req = soap_ctx_new(NULL);
diff --git a/libcsoap/soap-transport.c b/libcsoap/soap-transport.c
index 5cbdc46..1c5a7bd 100644
--- a/libcsoap/soap-transport.c
+++ b/libcsoap/soap-transport.c
@@ -1,5 +1,5 @@
/******************************************************************
-* $Id: soap-transport.c,v 1.7 2006/11/29 11:04:25 m0gg Exp $
+* $Id: soap-transport.c,v 1.8 2006/12/06 11:27:21 m0gg Exp $
*
* CSOAP Project: A SOAP client/server library in C
* Copyright (C) 2007 Heiko Ronsdorf
@@ -268,8 +268,8 @@ soap_transport_client_invoke(struct SoapCtx *request, struct SoapCtx **response)
herror_t ret;
xmlURI *dest;
- // log_verbose1(__FUNCTION__);
- // xmlDocFormatDump(stdout, request->env->root->doc, 1);
+ /* log_verbose1(__FUNCTION__);
+ xmlDocFormatDump(stdout, request->env->root->doc, 1); */
if (!(dest = soap_addressing_get_to_address(request->env)))
{
diff --git a/libcsoap/soap-xmlsec.c b/libcsoap/soap-xmlsec.c
index 14b1a4e..e4cadfb 100644
--- a/libcsoap/soap-xmlsec.c
+++ b/libcsoap/soap-xmlsec.c
@@ -1,5 +1,5 @@
/******************************************************************
-* $Id: soap-xmlsec.c,v 1.6 2006/11/29 13:01:00 m0gg Exp $
+* $Id: soap-xmlsec.c,v 1.7 2006/12/06 11:27:21 m0gg Exp $
*
* CSOAP Project: A SOAP client/server library in C
* Copyright (C) 2003 Ferhat Ayaz
@@ -135,7 +135,7 @@ _soap_xmlsec_files_keys_store_find_key(xmlSecKeyStorePtr store, const xmlChar *
xmlURI *uri;
char *file;
- log_info2("trying to find key \"%s\"\n", name);
+ log_verbose2("trying to find key \"%s\"\n", name);
/*
* it's possible to do not have the key name or desired key type but we could
@@ -160,10 +160,10 @@ _soap_xmlsec_files_keys_store_find_key(xmlSecKeyStorePtr store, const xmlChar *
return NULL;
}
- // printf("uri->scheme=\"%s\"\n", uri->scheme);
- // printf("uri->server=\"%s\"\n", uri->server);
- // printf("uri->port=\"%i\"\n", uri->port);
- // printf("uri->path=\"%s\"\n", uri->path);
+ /* printf("uri->scheme=\"%s\"\n", uri->scheme);
+ printf("uri->server=\"%s\"\n", uri->server);
+ printf("uri->port=\"%i\"\n", uri->port);
+ printf("uri->path=\"%s\"\n", uri->path); */
{
char *tmp;
@@ -174,10 +174,7 @@ _soap_xmlsec_files_keys_store_find_key(xmlSecKeyStorePtr store, const xmlChar *
{
tmp = "/tmp";
}
- // printf("tmp = \"%s\"\n", tmp);
-
sprintf(buf, "%s/csoap-XXXXXX-key.pem", tmp);
- // printf("buf = \"%s\"\n", buf);
if (mkstemps(buf, 8) < 0)
{
@@ -185,7 +182,6 @@ _soap_xmlsec_files_keys_store_find_key(xmlSecKeyStorePtr store, const xmlChar *
return NULL;
}
- // printf("fopen(\"%s\")\n", buf);
file = strdup(buf);
if (!(fp = fopen(buf, "w")))
@@ -360,8 +356,8 @@ _soap_xmlsec_load_key(void)
return herror_new("_soap_xmlsec_load_key", XMLSEC_ERROR_KEY, "xmlSecKeySetName(\"%s\") failed (%i)", keyName, err);
}
-// xmlSecKeyDebugXmlDump(_soap_xmlsec_key, stdout);
-// xmlSecKeyDataDebugXmlDump(xmlSecKeyGetValue(_soap_xmlsec_key), stdout);
+/* xmlSecKeyDebugXmlDump(_soap_xmlsec_key, stdout);
+ xmlSecKeyDataDebugXmlDump(xmlSecKeyGetValue(_soap_xmlsec_key), stdout); */
return H_OK;
}
@@ -644,9 +640,9 @@ herror_t soap_xmlsec_encrypt(struct SoapCtx *context)
doc = context->env->root->doc;
- // fprintf(stdout, "*** before encryption ***\n");
- // xmlDocFormatDump(stdout, doc, 1);
- // fprintf(stdout, "*************************\n");
+ /* fprintf(stdout, "*** before encryption ***\n");
+ xmlDocFormatDump(stdout, doc, 1);
+ fprintf(stdout, "*************************\n"); */
encDataNode = xmlSecTmplEncDataCreate(doc, xmlSecTransformDes3CbcId, NULL, xmlSecTypeEncElement, NULL, NULL);
if (encDataNode == NULL)
@@ -727,9 +723,9 @@ herror_t soap_xmlsec_encrypt(struct SoapCtx *context)
goto out;
}
- // fprintf(stdout, "*** before encryption ***\n");
- // xmlDocFormatDump(stdout, doc, 1);
- // fprintf(stdout, "*************************\n");
+ /* fprintf(stdout, "*** before encryption ***\n");
+ xmlDocFormatDump(stdout, doc, 1);
+ fprintf(stdout, "*************************\n"); */
if (xmlSecEncCtxXmlEncrypt(encCtx, encDataNode, soap_env_get_method(envelope)) < 0)
{
@@ -738,9 +734,11 @@ herror_t soap_xmlsec_encrypt(struct SoapCtx *context)
goto out;
}
- // fprintf(stdout, "*** after encryption ***\n");
- // xmlDocFormatDump(stdout, doc, 1);
- // fprintf(stdout, "************************\n");
+ /*
+ fprintf(stdout, "*** after encryption ***\n");
+ xmlDocFormatDump(stdout, doc, 1);
+ fprintf(stdout, "************************\n");
+ */
out:
@@ -863,7 +861,7 @@ herror_t soap_xmlsec_verify(struct SoapCtx *context)
{
if (!xmlStrcmp(walker->name, "Signature"))
{
- if (!xmlStrcmp(walker->ns->href, "http://schemas.xmlsoap.org/soap/security/2000-12"))
+ if (!xmlStrcmp(walker->ns->href, SOAP_SECURITY_NAMESPACE))
{
xmlNodePtr node;
xmlSecDSigCtxPtr dsigCtx;
diff --git a/libcsoap/soap-xmlsec.h b/libcsoap/soap-xmlsec.h
index 4a6209c..31ee408 100644
--- a/libcsoap/soap-xmlsec.h
+++ b/libcsoap/soap-xmlsec.h
@@ -1,5 +1,5 @@
/******************************************************************
- * $Id: soap-xmlsec.h,v 1.4 2006/11/29 11:04:25 m0gg Exp $
+ * $Id: soap-xmlsec.h,v 1.5 2006/12/06 11:27:21 m0gg Exp $
*
* CSOAP Project: A SOAP client/server library in C
* Copyright (C) 2006 Heiko Ronsdorf
@@ -31,11 +31,11 @@
* This module is implemented using the xmlsec1 library.
*
* @author H. Ronsdorf
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*
- * @see http://www.w3.org/TR/SOAP-dsig/,
- * http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wss,
- * http://www.aleksey.com/xmlsec/
+ * @see http://www.w3.org/TR/SOAP-dsig/
+ * @see http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wss
+ * @see http://www.aleksey.com/xmlsec/
*
*/
--
cgit v1.1-32-gdbae