CVS update: php3/functions
| From: | steinm | Date: | Thu, 11 Mar 1999 17:25:23 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-4574@lists.php.net to get a copy of this message | ||
Date: Thursday March 11, 1999 @ 12:25
Author: steinm
Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv16876/functions
Modified Files:
fdf.c hw.c
Log Message:
- some beautifying of the code
Index: php3/functions/fdf.c
diff -c php3/functions/fdf.c:1.2 php3/functions/fdf.c:1.3
*** php3/functions/fdf.c:1.2 Fri Jan 1 12:59:09 1999
--- php3/functions/fdf.c Thu Mar 11 12:25:23 1999
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: fdf.c,v 1.2 1999/01/01 17:59:09 zeev Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html.
*/
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: fdf.c,v 1.3 1999/03/11 17:25:23 steinm Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html.
*/
***************
*** 107,114 ****
FDF_GLOBAL(le_fdf) = register_list_destructors(FDFClose, NULL);
err = FDFInitialize();
if(err == FDFErcOK)
! printf("FDFINitital executed\n");
! return SUCCESS;
}
void php3_info_fdf(void) {
--- 107,114 ----
FDF_GLOBAL(le_fdf) = register_list_destructors(FDFClose, NULL);
err = FDFInitialize();
if(err == FDFErcOK)
! return SUCCESS;
! return(FAILURE);
}
void php3_info_fdf(void) {
***************
*** 120,127 ****
FDFErc err;
err = FDFFinalize();
if(err == FDFErcOK)
! printf("FDFFinalize executed\n");
! return SUCCESS;
}
/* {{{ proto int fdf_open(string filename)
--- 120,127 ----
FDFErc err;
err = FDFFinalize();
if(err == FDFErcOK)
! return SUCCESS;
! return(FAILURE);
}
/* {{{ proto int fdf_open(string filename)
***************
*** 220,225 ****
--- 220,226 ----
}
err = FDFGetValue(fdf, arg2->value.str.val, NULL, 0, &nr);
+ nr++;
if(err != FDFErcOK)
printf("Aiii, error\n");
buffer = emalloc(nr);
***************
*** 297,302 ****
--- 298,304 ----
}
err = FDFNextFieldName(fdf, fieldname, NULL, 0, &nr);
+ nr++;
if(err != FDFErcOK)
printf("Aiii, error\n");
if(nr == 0)
***************
*** 364,370 ****
void php3_fdf_set_status(INTERNAL_FUNCTION_PARAMETERS) {
pval *arg1, *arg2;
int id, type;
- ASInt32 nr;
FDFDoc fdf;
FDFErc err;
FDF_TLS_VARS;
--- 366,371 ----
***************
*** 414,425 ****
--- 415,428 ----
}
err = FDFGetStatus(fdf, NULL, 0, &nr);
+ nr++;
if(err != FDFErcOK)
printf("Aiii, error\n");
if(nr == 0)
RETURN_STRING(empty_string, 1);
buf = emalloc(nr);
err = FDFGetStatus(fdf, buf, nr, &nr);
+ fprintf(stderr, "status = %s (%d)\n", buf, nr);
if(err != FDFErcOK)
printf("Aiii, error\n");
***************
*** 481,492 ****
--- 484,497 ----
}
err = FDFGetFile(fdf, NULL, 0, &nr);
+ nr++;
if(err != FDFErcOK)
printf("Aiii, error\n");
if(nr == 0)
RETURN_STRING(empty_string, 1);
buf = emalloc(nr);
err = FDFGetFile(fdf, buf, nr, &nr);
+ fprintf(stderr, "file = %s (%d)\n", buf, nr);
if(err != FDFErcOK)
printf("Aiii, error\n");
Index: php3/functions/hw.c
diff -c php3/functions/hw.c:1.23 php3/functions/hw.c:1.24
*** php3/functions/hw.c:1.23 Mon Mar 8 07:57:30 1999
--- php3/functions/hw.c Thu Mar 11 12:25:23 1999
***************
*** 23,29 ****
+----------------------------------------------------------------------+
*/
! /* $Id: hw.c,v 1.23 1999/03/08 12:57:30 steinm Exp $ */
#if COMPILE_DL
#include "dl/phpdl.h"
#endif
--- 23,29 ----
+----------------------------------------------------------------------+
*/
! /* $Id: hw.c,v 1.24 1999/03/11 17:25:23 steinm Exp $ */
#if COMPILE_DL
#include "dl/phpdl.h"
#endif
***************
*** 2217,2223 ****
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getparentsobj(ptr->socket, id, &childObjRecs,
&count))) {
! php3_error(E_WARNING, "send_command (getparentsobj) returned -1\n");
RETURN_FALSE;
}
--- 2217,2223 ----
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getparentsobj(ptr->socket, id, &childObjRecs,
&count))) {
! php3_error(E_WARNING, "send_command (getparentsobj) returned %d\n",
ptr->lasterror);
RETURN_FALSE;
}
***************
*** 2255,2261 ****
int i;
if (0 != (ptr->lasterror = send_getparents(ptr->socket, id, &childIDs, &count))) {
! php3_error(E_WARNING, "send_command (getparents) returned -1\n");
RETURN_FALSE;
}
--- 2255,2261 ----
int i;
if (0 != (ptr->lasterror = send_getparents(ptr->socket, id, &childIDs, &count))) {
! php3_error(E_WARNING, "send_command (getparents) returned %d\n", ptr->lasterror);
RETURN_FALSE;
}
***************
*** 2301,2307 ****
int i;
if (0 != (ptr->lasterror = send_children(ptr->socket, id, &childIDs, &count))){
! php3_error(E_WARNING, "send_command (getchildcoll) returned -1\n");
RETURN_FALSE;
}
--- 2301,2307 ----
int i;
if (0 != (ptr->lasterror = send_children(ptr->socket, id, &childIDs, &count))){
! php3_error(E_WARNING, "send_command (getchildcoll) returned %d\n", ptr->lasterror);
RETURN_FALSE;
}
***************
*** 2345,2351 ****
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_childrenobj(ptr->socket, id, &childObjRecs,
&count))) {
! php3_error(E_WARNING, "send_command (getchildcollobj) returned -1\n");
RETURN_FALSE;
}
--- 2345,2351 ----
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_childrenobj(ptr->socket, id, &childObjRecs,
&count))) {
! php3_error(E_WARNING, "send_command (getchildcollobj) returned %d\n",
ptr->lasterror);
RETURN_FALSE;
}
***************
*** 2383,2389 ****
int i;
if (0 != (ptr->lasterror = send_getchildcoll(ptr->socket, id, &childIDs, &count))){
! php3_error(E_WARNING, "send_command (getchildcoll) returned -1\n");
RETURN_FALSE;
}
--- 2383,2389 ----
int i;
if (0 != (ptr->lasterror = send_getchildcoll(ptr->socket, id, &childIDs, &count))){
! php3_error(E_WARNING, "send_command (getchildcoll) returned %d\n", ptr->lasterror);
RETURN_FALSE;
}
***************
*** 2427,2433 ****
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getchildcollobj(ptr->socket, id, &childObjRecs,
&count))) {
! php3_error(E_WARNING, "send_command (getchildcollobj) returned -1\n");
RETURN_FALSE;
}
--- 2427,2433 ----
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getchildcollobj(ptr->socket, id, &childObjRecs,
&count))) {
! php3_error(E_WARNING, "send_command (getchildcollobj) returned %d\n",
ptr->lasterror);
RETURN_FALSE;
}
***************
*** 2534,2540 ****
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getobjbyquery(ptr->socket, query, maxhits, &childIDs,
&count))) {
! php3_error(E_WARNING, "send_command (getchildcoll) returned -1\n");
RETURN_FALSE;
}
--- 2534,2540 ----
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getobjbyquery(ptr->socket, query, maxhits, &childIDs,
&count))) {
! php3_error(E_WARNING, "send_command (getobjectbyquery) returned %d\n",
ptr->lasterror);
RETURN_FALSE;
}
***************
*** 2578,2584 ****
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getobjbyqueryobj(ptr->socket, query, maxhits,
&childObjRecs, &count))) {
! php3_error(E_WARNING, "send_command (getchildcoll) returned -1\n");
RETURN_FALSE;
}
--- 2578,2584 ----
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getobjbyqueryobj(ptr->socket, query, maxhits,
&childObjRecs, &count))) {
! php3_error(E_WARNING, "send_command (getobjectbyqueryobj) returned %d\n",
ptr->lasterror);
RETURN_FALSE;
}
***************
*** 2619,2625 ****
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getobjbyquerycoll(ptr->socket, id, query, maxhits,
&childIDs, &count))) {
! php3_error(E_WARNING, "send_command (getchildcoll) returned -1\n");
RETURN_FALSE;
}
--- 2619,2625 ----
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getobjbyquerycoll(ptr->socket, id, query, maxhits,
&childIDs, &count))) {
! php3_error(E_WARNING, "send_command (getobjectbyquerycoll) returned %d\n",
ptr->lasterror);
RETURN_FALSE;
}
***************
*** 2665,2671 ****
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getobjbyquerycollobj(ptr->socket, id, query, maxhits,
&childObjRecs, &count))) {
! php3_error(E_WARNING, "send_command (getchildcoll) returned -1\n");
RETURN_FALSE;
}
--- 2665,2671 ----
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getobjbyquerycollobj(ptr->socket, id, query, maxhits,
&childObjRecs, &count))) {
! php3_error(E_WARNING, "send_command (getobjectbyquerycollobj) returned %d\n",
ptr->lasterror);
RETURN_FALSE;
}
***************
*** 2700,2706 ****
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getchilddoccoll(ptr->socket, id, &childIDs,
&count))) {
! php3_error(E_WARNING, "send_command (getchilddoccoll) returned -1\n");
RETURN_FALSE;
}
--- 2700,2706 ----
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getchilddoccoll(ptr->socket, id, &childIDs,
&count))) {
! php3_error(E_WARNING, "send_command (getchilddoccoll) returned %d\n",
ptr->lasterror);
RETURN_FALSE;
}
***************
*** 2740,2746 ****
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getchilddoccollobj(ptr->socket, id, &childObjRecs,
&count))) {
! php3_error(E_WARNING, "send_command (getchilddoccollobj) returned -1\n");
RETURN_FALSE;
}
--- 2740,2746 ----
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getchilddoccollobj(ptr->socket, id, &childObjRecs,
&count))) {
! php3_error(E_WARNING, "send_command (getchilddoccollobj) returned %d\n",
ptr->lasterror);
RETURN_FALSE;
}
***************
*** 2776,2782 ****
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getanchors(ptr->socket, id, &anchorIDs, &count))) {
! php3_error(E_WARNING, "send_command (getanchors) returned -1\n");
RETURN_FALSE;
}
--- 2776,2782 ----
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getanchors(ptr->socket, id, &anchorIDs, &count))) {
! php3_error(E_WARNING, "send_command (getanchors) returned %d\n", ptr->lasterror);
RETURN_FALSE;
}
***************
*** 2816,2822 ****
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getanchorsobj(ptr->socket, id, &anchorObjRecs,
&count))) {
! php3_error(E_WARNING, "send_command (getanchors) returned -1\n");
RETURN_FALSE;
}
--- 2816,2822 ----
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getanchorsobj(ptr->socket, id, &anchorObjRecs,
&count))) {
! php3_error(E_WARNING, "send_command (getanchors) returned %d\n", ptr->lasterror);
RETURN_FALSE;
}
***************
*** 2880,2886 ****
char *str;
if (0 != (ptr->lasterror = send_identify(ptr->socket, name, passwd, &userdata))) {
! php3_error(E_WARNING, "send_identify returned -1\n");
if(ptr->username) free(ptr->username);
ptr->username = NULL;
RETURN_FALSE;
--- 2880,2886 ----
char *str;
if (0 != (ptr->lasterror = send_identify(ptr->socket, name, passwd, &userdata))) {
! php3_error(E_WARNING, "send_identify returned %d\n", ptr->lasterror);
if(ptr->username) free(ptr->username);
ptr->username = NULL;
RETURN_FALSE;
***************
*** 3105,3111 ****
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getsrcbydest(ptr->socket, id, &childObjRecs,
&count))) {
! php3_error(E_WARNING, "send_command (getsrcbydest) returned -1\n");
RETURN_FALSE;
}
--- 3105,3111 ----
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = send_getsrcbydest(ptr->socket, id, &childObjRecs,
&count))) {
! php3_error(E_WARNING, "send_command (getsrcbydest) returned %d\n", ptr->lasterror);
RETURN_FALSE;
}
***************
*** 3144,3150 ****
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = getrellink(ptr->socket, rootid, sourceid, destid,
&anchorstr))) {
! php3_error(E_WARNING, "command (getrellink) returned -1\n");
RETURN_FALSE;
}
--- 3144,3150 ----
set_swap(ptr->swap_on);
if (0 != (ptr->lasterror = getrellink(ptr->socket, rootid, sourceid, destid,
&anchorstr))) {
! php3_error(E_WARNING, "command (getrellink) returned %d\n", ptr->lasterror);
RETURN_FALSE;
}
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net