From d37d0e6e9bdc13a6f53e3c91467bba195cdd67c7 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 31 Jul 2014 11:59:23 +0000 Subject: [PATCH] New internal function for SCSI-logging arbitrary texts --- libburn/trunk/cdrskin/cdrskin_timestamp.h | 2 +- libburn/trunk/libburn/spc.c | 18 ++++++++++++++++++ libburn/trunk/libburn/spc.h | 4 ++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h index 653d4922..9d38b663 100644 --- a/libburn/trunk/cdrskin/cdrskin_timestamp.h +++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2014.07.14.180122" +#define Cdrskin_timestamP "2014.07.31.115829" diff --git a/libburn/trunk/libburn/spc.c b/libburn/trunk/libburn/spc.c index b252c43c..ddf7c104 100644 --- a/libburn/trunk/libburn/spc.c +++ b/libburn/trunk/libburn/spc.c @@ -1709,6 +1709,24 @@ int scsi_log_command(unsigned char *opcode, int oplen, int data_dir, } +/* ts B40731 */ +/* Arbitrary SCSI log message */ +int scsi_log_text(char *text, void *fp_in, int flag) +{ + FILE *fp = fp_in; + + if (fp != NULL && (fp == stderr || (burn_sg_log_scsi & 1))) { + fprintf(fp, "%s\n", text); + if (burn_sg_log_scsi & 4) + fflush(fp); + } + if (fp == stderr || !(burn_sg_log_scsi & 2)) + return 1; + fprintf(stderr, "%s\n", text); + return 1; +} + + /* ts A91218 (former sg_log_cmd ts A70518) */ /** Logs command (before execution) */ int scsi_log_cmd(struct command *c, void *fp_in, int flag) diff --git a/libburn/trunk/libburn/spc.h b/libburn/trunk/libburn/spc.h index 769bdaed..81f635aa 100644 --- a/libburn/trunk/libburn/spc.h +++ b/libburn/trunk/libburn/spc.h @@ -76,6 +76,10 @@ int scsi_log_command(unsigned char *opcode, int oplen, int data_dir, unsigned char *data, int bytes, void *fp_in, int flag); +/* ts B40731 */ +/* Arbitrary SCSI log message */ +int scsi_log_text(char *text, void *fp_in, int flag); + /* ts A91218 (former sg_log_cmd ts A70518) */ /** Legacy frontend to scsi_log_command() */ int scsi_log_cmd(struct command *c, void *fp, int flag);