You are viewing a plain text version of this content. The canonical link for it is here.
Posted to c-commits@axis.apache.org by da...@apache.org on 2011/06/01 18:08:30 UTC

svn commit: r1130202 - in /axis/axis2/c/core/trunk: include/axis2_options.h src/core/clientapi/options.c

Author: damitha
Date: Wed Jun  1 16:08:30 2011
New Revision: 1130202

URL: http://svn.apache.org/viewvc?rev=1130202&view=rev
Log:
Updating the API.

Modified:
    axis/axis2/c/core/trunk/include/axis2_options.h
    axis/axis2/c/core/trunk/src/core/clientapi/options.c

Modified: axis/axis2/c/core/trunk/include/axis2_options.h
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/include/axis2_options.h?rev=1130202&r1=1130201&r2=1130202&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/include/axis2_options.h (original)
+++ axis/axis2/c/core/trunk/include/axis2_options.h Wed Jun  1 16:08:30 2011
@@ -846,7 +846,7 @@ extern "C"
       * @param parent pointer to parent struct
       * @param username string representing username
       * @param password string representing password
-      * @param flags int pointer representing flags
+      * @param flags int representing flags
       * @param domain string representing domain
       * @param workstation string representing workstation
       * @param auth_type use "NTLM" to force ntlm http authentication
@@ -859,7 +859,7 @@ extern "C"
         const axutil_env_t * env,
         const axis2_char_t * username,
         const axis2_char_t * password,
-        const int * flags,
+        const int flags,
         const axis2_char_t * domain,
         const axis2_char_t * workstation,
         const axis2_char_t * auth_type);
@@ -870,7 +870,7 @@ extern "C"
       * @param parent pointer to parent struct
       * @param username string representing username
       * @param password string representing password
-      * @param flags int pointer representing flags
+      * @param flags pointer representing flags
       * @param domain string representing domain
       * @param workstation string representing workstation
       * @param auth_type use "NTLM" to force ntlm proxy authentication
@@ -883,7 +883,7 @@ extern "C"
         const axutil_env_t * env,
         const axis2_char_t * username,
         const axis2_char_t * password,
-        const int * flags,
+        const int flags,
         const axis2_char_t * domain,
         const axis2_char_t * workstation,
         const axis2_char_t * auth_type);

Modified: axis/axis2/c/core/trunk/src/core/clientapi/options.c
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/clientapi/options.c?rev=1130202&r1=1130201&r2=1130202&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/clientapi/options.c (original)
+++ axis/axis2/c/core/trunk/src/core/clientapi/options.c Wed Jun  1 16:08:30 2011
@@ -1073,12 +1073,13 @@ axis2_options_set_ntlm_proxy_auth_info(
     const axutil_env_t * env,
     const axis2_char_t * username,
     const axis2_char_t * password,
-    const int * flags,
+    const int flags,
     const axis2_char_t * domain,
     const axis2_char_t * workstation,
     const axis2_char_t * auth_type)
 {
     axis2_bool_t force_proxy_auth = AXIS2_FALSE;
+    axis2_char_t temp_str[4];
     axutil_property_t *prop_pw = NULL;
     axutil_property_t *prop_un = NULL;
     axutil_property_t *prop_fg = NULL;
@@ -1093,14 +1094,10 @@ axis2_options_set_ntlm_proxy_auth_info(
     axutil_property_set_value(prop_pw, env, axutil_strdup(env, password));
     axis2_options_set_property(options, env, AXIS2_PROXY_AUTH_PASSWD, prop_pw);
     
-    if(flags)
-    {
-        axis2_char_t temp_str[4];
-        sprintf(temp_str, "%d", *flags);
-        prop_fg = axutil_property_create(env);
-        axutil_property_set_value(prop_fg, env, axutil_strdup(env, temp_str));
-        axis2_options_set_property(options, env, AXIS2_NTLM_AUTH_FLAGS, prop_fg);
-    }
+    sprintf(temp_str, "%d", flags);
+    prop_fg = axutil_property_create(env);
+    axutil_property_set_value(prop_fg, env, axutil_strdup(env, temp_str));
+    axis2_options_set_property(options, env, AXIS2_NTLM_AUTH_FLAGS, prop_fg);
 
     if(domain)
     {
@@ -1149,12 +1146,13 @@ axis2_options_set_ntlm_http_auth_info(
     const axutil_env_t * env,
     const axis2_char_t * username,
     const axis2_char_t * password,
-    const int * flags,
+    const int flags,
     const axis2_char_t * domain,
     const axis2_char_t * workstation,
     const axis2_char_t * auth_type)
 {
     axis2_bool_t force_http_auth = AXIS2_FALSE;
+    axis2_char_t temp_str[4];
     axutil_property_t *prop_un = NULL;
     axutil_property_t *prop_pw = NULL;
     axutil_property_t *prop_fg = NULL;
@@ -1169,14 +1167,10 @@ axis2_options_set_ntlm_http_auth_info(
     axutil_property_set_value(prop_pw, env, axutil_strdup(env, password));
     axis2_options_set_property(options, env, AXIS2_HTTP_AUTH_PASSWD, prop_pw);
 
-    if(flags)
-    {
-        axis2_char_t temp_str[4];
-        sprintf(temp_str, "%d", *flags);
-        prop_fg = axutil_property_create(env);
-        axutil_property_set_value(prop_fg, env, axutil_strdup(env, temp_str));
-        axis2_options_set_property(options, env, AXIS2_NTLM_AUTH_FLAGS, prop_fg);
-    }
+    sprintf(temp_str, "%d", flags);
+    prop_fg = axutil_property_create(env);
+    axutil_property_set_value(prop_fg, env, axutil_strdup(env, temp_str));
+    axis2_options_set_property(options, env, AXIS2_NTLM_AUTH_FLAGS, prop_fg);
 
     if(domain)
     {