[Freeswitch-svn] [commit] r12996 - freeswitch/trunk/src/mod/applications/mod_cidlookup

[FreeSWITCH SVN]

Author: rupa
Date: Fri Apr 10 23:04:24 2009
New Revision: 12996

Log:
remove CURL conditionals -- it'll always be there


Modified:
   freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c

Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c	Fri Apr 10 23:04:24 2009
@@ -32,18 +32,11 @@
  *
  */
  
-/* ok, what is the right way to conditionally compile CURL? */
-#ifndef HAVE_CURL
-#define HAVE_CURL
-#endif
- 
 #include <switch.h>
 #ifdef SWITCH_HAVE_ODBC
 #include <switch_odbc.h>
 #endif
-#ifdef HAVE_CURL
 #include <curl/curl.h>
-#endif
 
 /* Prototypes */
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cidlookup_shutdown);
@@ -188,12 +181,6 @@
 		return SWITCH_STATUS_GENERR;
 	}
 	
-#ifndef HAVE_CURL
-	if (globals.url) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No LIBCURL - compile with LIBCURL or remove url param\n");
-		return SWITCH_STATUS_GENERR;
-	}
-#endif	
 	return SWITCH_STATUS_SUCCESS;
 }
 
@@ -305,7 +292,6 @@
 	return success;
 }
 
-#ifdef HAVE_CURL
 static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data)
 {
 	register unsigned int realsize = (unsigned int) (size * nmemb);
@@ -375,7 +361,6 @@
 	switch_safe_free(http_data.stream.data);
 	return name;
 }
-#endif 
 
 #ifdef SWITCH_HAVE_ODBC
 static char *do_db_lookup(switch_memory_pool_t *pool, switch_core_session_t *session, switch_event_t *event, const char *num) {
@@ -415,14 +400,12 @@
 		name = do_db_lookup(pool, session, event, number);
 	}
 #endif
-#ifdef HAVE_CURL
 	if (!name && globals.url) {
 		name = do_lookup_url(pool, session, event, number);
 		if (globals.cache && name) {
 			set_cache(pool, number, name);
 		}
 	}
-#endif
 	return name;
 }
 
@@ -464,15 +447,10 @@
 			stream->write_function(stream, " odbc-dsn: %s\n sql: %s\n", 
 									globals.odbc_dsn,
 									globals.sql);
-#ifdef HAVE_CURL
-			stream->write_function(stream, " LIBCURL: true");
-#else
-			stream->write_function(stream, " LIBCURL: false");
-#endif
 #ifdef SWITCH_HAVE_ODBC
-			stream->write_function(stream, " ODBC: true");
+			stream->write_function(stream, " ODBC Compiled: true\n");
 #else
-			stream->write_function(stream, " ODBC: false");
+			stream->write_function(stream, " ODBC Compiled: false\n");
 #endif
 
 			switch_goto_status(SWITCH_STATUS_SUCCESS, done);