[svn:dbi] rev 227 - dbi/trunk

[timbo]

Author: timbo
Date: Sat Mar 13 03:04:09 2004
New Revision: 227

Modified:
   dbi/trunk/Changes
   dbi/trunk/DBI.xs
Log:
Fixed compiler warning thanks to Paul Marquess.
Fixed "trace level set to" trace message thanks to H.Merijn Brand.


Modified: dbi/trunk/Changes
==============================================================================
--- dbi/trunk/Changes   (original)
+++ dbi/trunk/Changes   Sat Mar 13 03:04:09 2004
@@ -6,6 +6,11 @@
 
 Document $t->parse_trace_flags etc
 
+=head1 CHANGES in DBI 1.43 (svn rev XXX),    XXth XXX 2004
+
+  Fixed compiler warning thanks to Paul Marquess.
+  Fixed "trace level set to" trace message thanks to H.Merijn Brand.
+
 =head1 CHANGES in DBI 1.42 (svn rev 222),    12th March 2004
 
   Fixed $sth->{NUM_OF_FIELDS} of non-executed statement handle

Modified: dbi/trunk/DBI.xs
==============================================================================
--- dbi/trunk/DBI.xs    (original)
+++ dbi/trunk/DBI.xs    Sat Mar 13 03:04:09 2004
@@ -657,10 +657,10 @@
     if (level != RETVAL) { /* set value */
        if ((level & DBIc_TRACE_LEVEL_MASK) > 0) {
            PerlIO_printf(DBIc_LOGPIO(imp_xxh),
-               "    %s trace level set to 0x%lx/%ld (DBI @ Ox%lx/%ld) in DBI %s%s 
(pid %d)\n",
+               "    %s trace level set to 0x%lx/%ld (DBI @ 0x%lx/%ld) in DBI %s%s 
(pid %d)\n",
                neatsvpv(h,0),
-               (long)(level &  DBIc_TRACE_LEVEL_MASK),
-               (long)(level & ~DBIc_TRACE_LEVEL_MASK),
+               (long)(level & DBIc_TRACE_FLAGS_MASK),
+               (long)(level & DBIc_TRACE_LEVEL_MASK),
                DBIc_TRACE_LEVEL(imp_xxh), DBIc_TRACE_FLAGS(imp_xxh),
                XS_VERSION, dbi_build_opt, (int)PerlProc_getpid());
            if (!PL_dowarn)
@@ -2288,7 +2288,7 @@
     int is_DESTROY;
     int is_FETCH;
     int keep_error = FALSE;
-    UV  ErrCount = ~0;
+    UV  ErrCount = UV_MAX;
     int i, outitems;
     int call_depth;
     double profile_t1 = 0.0;
@@ -3555,10 +3555,10 @@
         set_trace_file(file);
     if (level != RETVAL) {
        if ((level & DBIc_TRACE_LEVEL_MASK) > 0) {
-           PerlIO_printf(DBILOGFP,"    DBI %s%s default trace level set to Ox%lx/%ld 
(in pid %d)\n",
+           PerlIO_printf(DBILOGFP,"    DBI %s%s default trace level set to 0x%lx/%ld 
(pid %d)\n",
                XS_VERSION, dbi_build_opt,
-                (long)(level &  DBIc_TRACE_LEVEL_MASK),
-                (long)(level & ~DBIc_TRACE_LEVEL_MASK),
+                (long)(level & DBIc_TRACE_FLAGS_MASK),
+                (long)(level & DBIc_TRACE_LEVEL_MASK),
                (int)PerlProc_getpid());
            if (!PL_dowarn)
                PerlIO_printf(DBILOGFP,"    Note: perl is running without the 
recommended perl -w option\n");