[opensc-devel] Re: [opensc-commits] svn opensc changed [3062] enable APDU logging again

[Ludovic Rousseau]

Hello,

The DEBUG symbol is no more used in OpenSC. I then propose to remove
the --enable-debug configure option since it is now useless.

Any objection?

Bye

On 23/11/06, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:

Revision: 3062
Author:   nils
Date:     2006-11-23 22:40:01 +0000 (Thu, 23 Nov 2006)

Log Message:
-----------
enable APDU logging again

Modified Paths:
--------------
    trunk/src/libopensc/reader-ctapi.c
    trunk/src/libopensc/reader-openct.c
    trunk/src/libopensc/reader-pcsc.c
Modified: trunk/src/libopensc/reader-ctapi.c
===================================================================
--- trunk/src/libopensc/reader-ctapi.c  2006-11-22 19:27:52 UTC (rev 3061)
+++ trunk/src/libopensc/reader-ctapi.c  2006-11-23 22:40:01 UTC (rev 3062)
@@ -332,10 +332,8 @@
        r = sc_apdu_get_octets(reader->ctx, apdu, &sbuf, &ssize, SC_PROTO_RAW);
        if (r != SC_SUCCESS)
                goto out;
-       /* log data if DEBUG is defined */
-#ifdef DEBUG
-       sc_apdu_log(reader->ctx, sbuf, ssize, 1);
-#endif
+       if (reader->ctx->debug >= 6)
+               sc_apdu_log(reader->ctx, sbuf, ssize, 1);
        r = ctapi_internal_transmit(reader, slot, sbuf, ssize,
                                        rbuf, &rsize, apdu->control);
        if (r < 0) {
@@ -343,10 +341,8 @@
                sc_error(reader->ctx, "unable to transmit");
                goto out;
        }
-       /* log data if DEBUG is defined */
-#ifdef DEBUG
-       sc_apdu_log(reader->ctx, rbuf, rsize, 0);
-#endif
+       if (reader->ctx->debug >= 6)
+               sc_apdu_log(reader->ctx, rbuf, rsize, 0);
        /* set response */
        r = sc_apdu_set_resp(reader->ctx, apdu, rbuf, rsize);
 out:

Modified: trunk/src/libopensc/reader-openct.c
===================================================================
--- trunk/src/libopensc/reader-openct.c 2006-11-22 19:27:52 UTC (rev 3061)
+++ trunk/src/libopensc/reader-openct.c 2006-11-23 22:40:01 UTC (rev 3062)
@@ -330,10 +330,8 @@
        r = sc_apdu_get_octets(reader->ctx, apdu, &sbuf, &ssize, SC_PROTO_RAW);
        if (r != SC_SUCCESS)
                goto out;
-       /* log data if DEBUG is defined */
-#ifdef DEBUG
-       sc_apdu_log(reader->ctx, sbuf, ssize, 1);
-#endif
+       if (reader->ctx->debug >= 6)
+               sc_apdu_log(reader->ctx, sbuf, ssize, 1);
        r = openct_reader_internal_transmit(reader, slot, sbuf, ssize,
                                rbuf, &rsize, apdu->control);
        if (r < 0) {
@@ -341,10 +339,8 @@
                sc_error(reader->ctx, "unable to transmit");
                goto out;
        }
-       /* log data if DEBUG is defined */
-#ifdef DEBUG
-       sc_apdu_log(reader->ctx, rbuf, rsize, 0);
-#endif
+       if (reader->ctx->debug >= 6)
+               sc_apdu_log(reader->ctx, rbuf, rsize, 0);
        /* set response */
        r = sc_apdu_set_resp(reader->ctx, apdu, rbuf, rsize);
 out:

Modified: trunk/src/libopensc/reader-pcsc.c
===================================================================
--- trunk/src/libopensc/reader-pcsc.c   2006-11-22 19:27:52 UTC (rev 3061)
+++ trunk/src/libopensc/reader-pcsc.c   2006-11-23 22:40:01 UTC (rev 3062)
@@ -237,10 +237,8 @@
        r = sc_apdu_get_octets(reader->ctx, apdu, &sbuf, &ssize, 
slot->active_protocol);
        if (r != SC_SUCCESS)
                goto out;
-       /* log data if DEBUG is defined */
-#ifdef DEBUG
-       sc_apdu_log(reader->ctx, sbuf, ssize, 1);
-#endif
+       if (reader->ctx->debug >= 6)
+               sc_apdu_log(reader->ctx, sbuf, ssize, 1);

        r = pcsc_internal_transmit(reader, slot, sbuf, ssize,
                                rbuf, &rsize, apdu->control);
@@ -249,10 +247,8 @@
                sc_error(reader->ctx, "unable to transmit");
                goto out;
        }
-       /* log data if DEBUG is defined */
-#ifdef DEBUG
-       sc_apdu_log(reader->ctx, rbuf, rsize, 0);
-#endif
+       if (reader->ctx->debug >= 6)
+               sc_apdu_log(reader->ctx, rbuf, rsize, 0);
        /* set response */
        r = sc_apdu_set_resp(reader->ctx, apdu, rbuf, rsize);
 out:

--
Dr. Ludovic Rousseau
_______________________________________________
opensc-devel mailing list
opensc-devel@lists.opensc-project.org
http://www.opensc-project.org/mailman/listinfo/opensc-devel