fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-08-24 12:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbcurl/hbcurl.c
  * contrib/hbcurl/hbcurls/Makefile
  * contrib/hbcurl/Makefile
  - contrib/hbcurl/hbcurlm.c
    - Deleted two wrappers belonging to share/multi interfaces.
    * Moved two legacy functions back to main source.
    - Deleted hbcurlm.c which caused doubly defined symbols
      when built with pocc. It was caused by some curl header
      features most probably.

  * config/global.mk
    * Comment update in config var planning section.
This commit is contained in:
Viktor Szakats
2009-08-24 10:42:41 +00:00
parent c167e9b26f
commit 98317db6b4
6 changed files with 54 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -17,6 +17,20 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-24 12:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbcurl/hbcurl.c
* contrib/hbcurl/hbcurls/Makefile
* contrib/hbcurl/Makefile
- contrib/hbcurl/hbcurlm.c
- Deleted two wrappers belonging to share/multi interfaces.
* Moved two legacy functions back to main source.
- Deleted hbcurlm.c which caused doubly defined symbols
when built with pocc. It was caused by some curl header
features most probably.
* config/global.mk
* Comment update in config var planning section.
2009-08-24 04:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/Makefile
* contrib/gtqtc/Makefile

19
harbour/config/global.mk
View File

@@ -238,20 +238,25 @@ ifeq ($(HB_INIT_DONE),)
ifneq ($(MAKE_381),)
# Some additional ones to be given a standard name:
# HB_HOST_BUILD [yes|all|lib] -> ?
# HB_XBUILD -> HB_BUILD_INCDEF
# HB_WITHOUT_* -> HB_HAS_*
# HB_REBUILD_PARSER -> HB_BUILD_PARSER
# HB_HOST_BUILD [yes|all|lib] -> ? (yes = build harbour/hbpp bin only, all = default, lib = build libs only)
# HB_XBUILD -> HB_BUILD_INCDEF (disables default *nix values for HB_INC_* vars)
# HB_REBUILD_PARSER -> HB_BUILD_PARSER (or maybe HB_HAVE_BISON?)
# HB_DB_DRVEXT -> -
# HB_COMMERCE -> ?
# HB_CRS_LIB -> HB_LIB_CURSES
# HB_BIN_COMPILE -> HB_BUILD_BIN_DIR
# HB_INC_COMPILE -> - (HB_BUILD_INC_DIR)
# HB_GPM_MOUSE -> HB_HAS_GPM
# HB_GPM_NOICE_DISABLE -> HB_USER_CFLAGS=-DHB_GPM_NOICE_DISABLE
# HB_GT_CRS_BCEHACK -> HB_USER_CFLAGS=-DHB_GT_CRS_BCEHACK
# HB_NCURSES_194 -> HB_USER_CFLAGS=-DHB_NCURSES_194
# HB_DLLIBS -> ?
# HB_DLLIBS -> (only used in place location, so it's a local matter)
#
# HB_CRS_LIB -> HB_LIB_CURSES
# HB_GPM_MOUSE -> HB_HAS_GPM ?
# HB_WITHOUT_* -> HB_HAS_* ?
# HB_INC_* -> ?
# HB_DIR_* -> ?
# HB_HAS_* -> ?
#
# Macros:
# -DHB_PCRE_REGEX, -DHB_POSIX_REGEX, -DHB_EXT_ZLIB, -DHB_HAS_GPM, -DHB_GT_LIB=

1
harbour/contrib/hbcurl/Makefile
View File

@@ -28,7 +28,6 @@ HB_CFLAGS += $(foreach d,$(HB_INC_CURL_OK),-I$(d))
C_SOURCES := \
hbcurl.c \
hbcurlm.c \
PRG_HEADERS := \
hbcurl.ch \

28
harbour/contrib/hbcurl/hbcurl.c
View File

@@ -1843,3 +1843,31 @@ HB_FUNC( CURL_GETDATE )
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
/* Harbour interface (session independent) */
/* NOTE: Obsolete, superceded by curl_easy_escape() */
HB_FUNC( CURL_ESCAPE )
{
if( HB_ISCHAR( 1 ) )
{
char * buffer = curl_escape( hb_parc( 1 ), hb_parclen( 1 ) );
hb_retc( buffer );
curl_free( buffer );
}
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
/* NOTE: Obsolete, superceded by curl_easy_unescape() */
HB_FUNC( CURL_UNESCAPE )
{
if( HB_ISCHAR( 1 ) )
{
char * buffer = curl_unescape( hb_parc( 1 ), hb_parclen( 1 ) );
hb_retc( buffer );
curl_free( buffer );
}
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}

110
harbour/contrib/hbcurl/hbcurlm.c
View File

@@ -1,110 +0,0 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* libcurl misc API - Harbour interface.
*
* Copyright 2008 Viktor Szakats (harbour.01 syenar.hu)
* www - http://www.harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
*
* As a special exception, the Harbour Project gives permission for
* additional uses of the text contained in its release of Harbour.
*
* The exception is that, if you link the Harbour libraries with other
* files to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the Harbour library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the Harbour
* Project under the name Harbour. If you copy code from other
* Harbour Project or Free Software Foundation releases into a copy of
* Harbour, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for Harbour, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*
*/
#include "curl/curl.h"
#include "curl/types.h"
#include "curl/multi.h"
#include "hbapi.h"
#include "hbapierr.h"
#if LIBCURL_VERSION_NUM >= 0x070C00
HB_FUNC( CURL_MULTI_STRERROR )
{
if( HB_ISNUM( 1 ) )
hb_retc( curl_multi_strerror( ( CURLMcode ) hb_parnl( 1 ) ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
#endif
#if LIBCURL_VERSION_NUM >= 0x070C00
HB_FUNC( CURL_SHARE_STRERROR )
{
if( HB_ISNUM( 1 ) )
hb_retc( curl_share_strerror( ( CURLSHcode ) hb_parnl( 1 ) ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
#endif
/* Harbour interface (session independent) */
/* NOTE: Obsolete, superceded by curl_easy_escape() */
HB_FUNC( CURL_ESCAPE )
{
if( HB_ISCHAR( 1 ) )
{
char * buffer = curl_escape( hb_parc( 1 ), hb_parclen( 1 ) );
hb_retc( buffer );
curl_free( buffer );
}
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
/* NOTE: Obsolete, superceded by curl_easy_unescape() */
HB_FUNC( CURL_UNESCAPE )
{
if( HB_ISCHAR( 1 ) )
{
char * buffer = curl_unescape( hb_parc( 1 ), hb_parclen( 1 ) );
hb_retc( buffer );
curl_free( buffer );
}
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}

1
harbour/contrib/hbcurl/hbcurls/Makefile
View File

@@ -20,7 +20,6 @@ HB_CFLAGS += $(foreach d,$(HB_INC_CURL_OK),-I$(d))
C_SOURCES := \
hbcurl.c \
hbcurlm.c \
include $(TOP)$(ROOT)config/lib.mk