CVS update: php3/functions
| From: | rasmus | Date: | Sun, 20 Dec 1998 15:14:31 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-2907@lists.php.net to get a copy of this message | ||
Date: Sunday December 20, 1998 @ 10:14
Author: rasmus
Update of /repository/php3/functions
In directory asf:/home/rasmus/php3/functions
Modified Files:
dbase.c dbase.h pdf.c string.c
Log Message:
Fix a bunch of compiler warnings and an outright bug in pdf.c
Index: php3/functions/dbase.c
diff -c php3/functions/dbase.c:1.69 php3/functions/dbase.c:1.70
*** php3/functions/dbase.c:1.69 Mon Nov 23 01:07:25 1998
--- php3/functions/dbase.c Sun Dec 20 10:14:29 1998
***************
*** 42,47 ****
--- 42,48 ----
#include "fopen-wrappers.h"
#if DBASE
+ #include "dbase.h"
#include "../dbase/dbf.h"
#if defined(THREAD_SAFE)
DWORD DbaseTls;
Index: php3/functions/dbase.h
diff -c php3/functions/dbase.h:1.11 php3/functions/dbase.h:1.12
*** php3/functions/dbase.h:1.11 Fri May 15 06:57:21 1998
--- php3/functions/dbase.h Sun Dec 20 10:14:30 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: dbase.h,v 1.11 1998/05/15 10:57:21 zeev Exp $ */
#ifndef _DBASE_H
#define _DBASE_H
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: dbase.h,v 1.12 1998/12/20 15:14:30 rasmus Exp $ */
#ifndef _DBASE_H
#define _DBASE_H
***************
*** 45,50 ****
--- 45,51 ----
extern void php3_dbase_get_record(INTERNAL_FUNCTION_PARAMETERS);
extern void php3_dbase_delete_record(INTERNAL_FUNCTION_PARAMETERS);
extern void php3_dbase_pack(INTERNAL_FUNCTION_PARAMETERS);
+ extern void php3_dbase_get_record_with_names(INTERNAL_FUNCTION_PARAMETERS);
#else
#define dbase_module_ptr NULL
#endif
Index: php3/functions/pdf.c
diff -c php3/functions/pdf.c:1.11 php3/functions/pdf.c:1.12
*** php3/functions/pdf.c:1.11 Thu Dec 3 17:58:51 1998
--- php3/functions/pdf.c Sun Dec 20 10:14:30 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: pdf.c,v 1.11 1998/12/03 22:58:51 shane Exp $ */
/* pdflib 0.6 is subject to the ALADDIN FREE PUBLIC LICENSE.
Copyright (C) 1997 Thomas Merz. */
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: pdf.c,v 1.12 1998/12/20 15:14:30 rasmus Exp $ */
/* pdflib 0.6 is subject to the ALADDIN FREE PUBLIC LICENSE.
Copyright (C) 1997 Thomas Merz. */
***************
*** 147,153 ****
DLEXPORT php3_module_entry *get_module(void) { return &pdf_module_entry; }
#endif
! void _free_pdf_info(PDF_info *info)
{
if(info->Title) efree(info->Title);
if(info->Subject) efree(info->Subject);
--- 147,153 ----
DLEXPORT php3_module_entry *get_module(void) { return &pdf_module_entry; }
#endif
! static void _free_pdf_info(PDF_info *info)
{
if(info->Title) efree(info->Title);
if(info->Subject) efree(info->Subject);
***************
*** 1282,1292 ****
PDF *pdf;
PDF_TLS_VARS;
! if (ARG_COUNT(ht) != 4 || getParameters(ht, 4, &arg1, &arg2, &arg3, &arg4) ==
FAILURE) {
WRONG_PARAM_COUNT;
}
- /* FIXME Why is this function using 6 args, but not retrieving six args above? */
convert_to_long(arg1);
convert_to_double(arg2);
convert_to_double(arg3);
--- 1282,1291 ----
PDF *pdf;
PDF_TLS_VARS;
! if (ARG_COUNT(ht) != 6 || getParameters(ht, 6, &arg1, &arg2, &arg3, &arg4,
&arg5, &arg6) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long(arg1);
convert_to_double(arg2);
convert_to_double(arg3);
Index: php3/functions/string.c
diff -c php3/functions/string.c:1.153 php3/functions/string.c:1.154
*** php3/functions/string.c:1.153 Sun Dec 20 02:32:29 1998
--- php3/functions/string.c Sun Dec 20 10:14:30 1998
***************
*** 30,36 ****
*/
! /* $Id: string.c,v 1.153 1998/12/20 07:32:29 sas Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 30,36 ----
*/
! /* $Id: string.c,v 1.154 1998/12/20 15:14:30 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 1303,1309 ****
convert_to_string(needle);
convert_to_string(str);
! if(needle->value.str.len == 1 && isalnum(*(needle->value.str.val))) {
/* argh, chr_replace isn't binary safe */
return php3_chr_replace(INTERNAL_FUNCTION_PARAM_PASSTHRU);
}
--- 1303,1309 ----
convert_to_string(needle);
convert_to_string(str);
! if(needle->value.str.len == 1 && isalnum((int)*(needle->value.str.val))) {
/* argh, chr_replace isn't binary safe */
return php3_chr_replace(INTERNAL_FUNCTION_PARAM_PASSTHRU);
}
--
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