Author: timbo
Date: Mon Mar 2 03:14:07 2009
New Revision: 12559
Modified:
dbi/trunk/Changes
dbi/trunk/DBI.xs
dbi/trunk/DBIXS.h
dbi/trunk/dbixs_rev.h
Log:
Fixed 64bit issues in trace messages thanks to Charles Jardine.
Modified: dbi/trunk/Changes
==============================================================================
--- dbi/trunk/Changes (original)
+++ dbi/trunk/Changes Mon Mar 2 03:14:07 2009
@@ -61,6 +61,7 @@
Both due to "local $ENV{...};" leaking memory.
Fixed DBD_ATTRIB_DELETE macro for driver authors
and updated DBI::DBD docs thanks to Martin J. Evans.
+ Fixed 64bit issues in trace messages thanks to Charles Jardine.
Corrected many typos in DBI docs thanks to Martin J. Evans.
Improved DBI::DBD docs thanks to H.Merijn Brand.
Modified: dbi/trunk/DBI.xs
==============================================================================
--- dbi/trunk/DBI.xs (original)
+++ dbi/trunk/DBI.xs Mon Mar 2 03:14:07 2009
@@ -884,7 +884,7 @@
neatsvpv(h,0),
(long)(level & DBIc_TRACE_FLAGS_MASK),
(long)(level & DBIc_TRACE_LEVEL_MASK),
- DBIc_TRACE_LEVEL(imp_xxh), DBIc_TRACE_FLAGS(imp_xxh),
+ (long)DBIc_TRACE_FLAGS(imp_xxh),
(long)DBIc_TRACE_LEVEL(imp_xxh),
XS_VERSION, dbi_build_opt, (int)PerlProc_getpid());
if (!PL_dowarn)
PerlIO_printf(DBIc_LOGPIO(imp_xxh)," Note: perl is running
without the recommended perl -w option\n");
@@ -1546,14 +1546,14 @@
return av;
/* we need to adjust the size of the array */
if (DBIc_TRACE_LEVEL(imp_sth) >= 2)
- PerlIO_printf(DBILOGFP," dbih_setup_fbav realloc from %ld to
%ld fields\n", av_len(av)+1, i);
+ PerlIO_printf(DBILOGFP," dbih_setup_fbav realloc from %ld to
%ld fields\n", (long)(av_len(av)+1), (long)i);
SvREADONLY_off(av);
if (i < av_len(av)+1) /* trim to size if too big */
av_fill(av, i-1);
}
else {
if (DBIc_TRACE_LEVEL(imp_sth) >= 5)
- PerlIO_printf(DBILOGFP," dbih_setup_fbav alloc for %ld
fields\n", i);
+ PerlIO_printf(DBILOGFP," dbih_setup_fbav alloc for %ld
fields\n", (long)i);
av = newAV();
DBIc_FIELDS_AV(imp_sth) = av;
@@ -1567,7 +1567,7 @@
while(i--) /* field 1 stored at index 0 */
av_store(av, i, newSV(0));
if (DBIc_TRACE_LEVEL(imp_sth) >= 6)
- PerlIO_printf(DBILOGFP," dbih_setup_fbav now %ld fields\n",
av_len(av)+1);
+ PerlIO_printf(DBILOGFP," dbih_setup_fbav now %ld fields\n",
(long)(av_len(av)+1));
SvREADONLY_on(av); /* protect against shift @$row etc */
return av;
}
Modified: dbi/trunk/DBIXS.h
==============================================================================
--- dbi/trunk/DBIXS.h (original)
+++ dbi/trunk/DBIXS.h Mon Mar 2 03:14:07 2009
@@ -304,7 +304,8 @@
if (!DBIc_ACTIVE(imp) && ph_com && !dirty \
&& ++DBIc_ACTIVE_KIDS(ph_com) > DBIc_KIDS(ph_com)) \
croak("panic: DBI active kids (%ld) > kids (%ld)", \
- DBIc_ACTIVE_KIDS(ph_com), DBIc_KIDS(ph_com)); \
+ (long)DBIc_ACTIVE_KIDS(ph_com), \
+ (long)DBIc_KIDS(ph_com)); \
DBIc_FLAGS(imp) |= DBIcf_ACTIVE; \
} while(0)
#define DBIc_ACTIVE_off(imp) /* adjust parent's active kid count */ \
@@ -314,7 +315,8 @@
&& (--DBIc_ACTIVE_KIDS(ph_com) > DBIc_KIDS(ph_com) \
|| DBIc_ACTIVE_KIDS(ph_com) < 0) ) \
croak("panic: DBI active kids (%ld) < 0 or > kids (%ld)", \
- DBIc_ACTIVE_KIDS(ph_com), DBIc_KIDS(ph_com)); \
+ (long)DBIc_ACTIVE_KIDS(ph_com), \
+ (long)DBIc_KIDS(ph_com)); \
DBIc_FLAGS(imp) &= ~DBIcf_ACTIVE; \
} while(0)
Modified: dbi/trunk/dbixs_rev.h
==============================================================================
--- dbi/trunk/dbixs_rev.h (original)
+++ dbi/trunk/dbixs_rev.h Mon Mar 2 03:14:07 2009
@@ -1,4 +1,3 @@
-/* Thu Sep 11 17:32:48 2008 */
-/* Mixed revision working copy (11611M:11719) */
+/* Mon Mar 2 11:10:31 2009 */
/* Code modified since last checkin */
-#define DBIXS_REVISION 11611
+#define DBIXS_REVISION 12558
