From 55454ea9734edb08e0323251b43887dd6704fbd4 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Tue, 6 Nov 2012 16:59:45 +0000
Subject: Fix apps/netutils/webclient build problem

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5317 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/examples/ostest/Kconfig        |  2 --
 apps/include/netutils/webclient.h   |  2 ++
 apps/netutils/webclient/webclient.c | 17 ++++++++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'apps')

diff --git a/apps/examples/ostest/Kconfig b/apps/examples/ostest/Kconfig
index 3c64dc0c6..c3fe8f21d 100644
--- a/apps/examples/ostest/Kconfig
+++ b/apps/examples/ostest/Kconfig
@@ -43,7 +43,6 @@ config EXAMPLES_OSTEST_RR_RANGE
 	int "Round-robin test - end of search range"
 	default 10000
 	range 1 32767
-	depends on RR_INTERVAL > 0
 	---help---
 		During round-robin scheduling test two threads are created. Each of the threads
 		searches for prime numbers in the configurable range, doing that configurable
@@ -57,7 +56,6 @@ config EXAMPLES_OSTEST_RR_RUNS
 	int "Round-robin test - number of runs"
 	default 10
 	range 1 32767
-	depends on RR_INTERVAL > 0
 	---help---
 		During round-robin scheduling test two threads are created. Each of the threads
 		searches for prime numbers in the configurable range, doing that configurable
diff --git a/apps/include/netutils/webclient.h b/apps/include/netutils/webclient.h
index 3a4c4ea90..85ca759e9 100644
--- a/apps/include/netutils/webclient.h
+++ b/apps/include/netutils/webclient.h
@@ -109,12 +109,14 @@ extern "C" {
 #define EXTERN extern
 #endif
 
+#ifdef WGET_USE_URLENCODE
 EXTERN char *web_post_str(FAR char *buffer, int *size, FAR char *name,
                           FAR char *value);
 EXTERN char *web_posts_str(FAR char *buffer, int *size, FAR char **name,
                            FAR char **value, int len);
 EXTERN int web_post_strlen(FAR char *name, FAR char *value);
 EXTERN int web_posts_strlen(FAR char **name, FAR char **value, int len);
+#endif
 
 /****************************************************************************
  * Name: wget
diff --git a/apps/netutils/webclient/webclient.c b/apps/netutils/webclient/webclient.c
index 2604ce020..927993179 100644
--- a/apps/netutils/webclient/webclient.c
+++ b/apps/netutils/webclient/webclient.c
@@ -77,12 +77,15 @@
 
 #if defined(CONFIG_NETUTILS_CODECS)
 #  if defined(CONFIG_CODECS_URLCODE)
-#    define     WGET_USE_URLENCODE      1
+#    define WGET_USE_URLENCODE 1
 #    include <apps/netutils/urldecode.h>
 #  endif
 #  if defined(CONFIG_CODECS_BASE64)
 #    include <apps/netutils/base64.h>
 #  endif
+#else
+#  undef CONFIG_CODECS_URLCODE
+#  undef CONFIG_CODECS_BASE64
 #endif
 
 #ifndef CONFIG_NSH_WGET_USERAGENT
@@ -206,7 +209,7 @@ static char *wget_strcpy(char *dest, const char *src)
  * Name: wget_urlencode_strcpy
  ****************************************************************************/
 
-#ifdef  WGET_USE_URLENCODE
+#ifdef WGET_USE_URLENCODE
 static char *wget_urlencode_strcpy(char *dest, const char *src)
 {
   int len = strlen(src);
@@ -621,6 +624,7 @@ errout:
  * Name: web_post_str
  ****************************************************************************/
 
+#ifdef WGET_USE_URLENCODE
 char *web_post_str(FAR char *buffer, int *size, FAR char *name,
                    FAR char *value)
 {
@@ -631,20 +635,24 @@ char *web_post_str(FAR char *buffer, int *size, FAR char *name,
   *size  = buffer - dst;
   return dst;
 }
+#endif
 
 /****************************************************************************
  * Name: web_post_strlen
  ****************************************************************************/
 
+#ifdef WGET_USE_URLENCODE
 int web_post_strlen(FAR char *name, FAR char *value)
 {
   return strlen(name) + urlencode_len(value,strlen(value)) + 1;
 }
+#endif
 
 /****************************************************************************
  * Name: web_posts_str
  ****************************************************************************/
 
+#ifdef WGET_USE_URLENCODE
 char *web_posts_str(FAR char *buffer, int *size, FAR char **name,
                     FAR char **value, int len)
 {
@@ -667,11 +675,13 @@ char *web_posts_str(FAR char *buffer, int *size, FAR char **name,
   *size=buffer-dst;
   return dst;
 }
+#endif
 
 /****************************************************************************
  * Name: web_posts_strlen
  ****************************************************************************/
 
+#ifdef WGET_USE_URLENCODE
 int web_posts_strlen(FAR char **name, FAR char **value, int len)
 {
   int wlen = 0;
@@ -684,6 +694,7 @@ int web_posts_strlen(FAR char **name, FAR char **value, int len)
 
   return wlen + len - 1;
 }
+#endif
 
 /****************************************************************************
  * Name: wget
@@ -720,7 +731,7 @@ int wget(FAR const char *url, FAR char *buffer, int buflen,
 }
 
 /****************************************************************************
- * Name: web_posts_strlen
+ * Name: wget_post
  ****************************************************************************/
 
 int wget_post(FAR const char *url, FAR const char *posts, FAR char *buffer,
-- 
cgit v1.2.3