From bca4682e63c96ba7db06c9b173233d0f2f559858 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Sat, 10 Jan 2009 15:40:45 +0000
Subject: [PATCH] Avoiding use of function parameter name "class"

---
 xorriso/xorriso.c           | 14 +++++++-------
 xorriso/xorriso.h           |  4 ++++
 xorriso/xorriso_timestamp.h |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/xorriso/xorriso.c b/xorriso/xorriso.c
index 74e090bb..5a592441 100644
--- a/xorriso/xorriso.c
+++ b/xorriso/xorriso.c
@@ -6147,7 +6147,7 @@ int Xorriso_status(struct XorrisO *xorriso, char *filter, FILE *fp, int flag)
      Xorriso_status_result(xorriso,filter,fp,flag&2);
    }
    for(s= xorriso->drive_greylist; s != NULL; s= Xorriso_lst_get_next(s, 0)) {
-     sprintf(line, "-drive_class 'risky'    %s\n",
+     sprintf(line, "-drive_class 'caution'    %s\n",
              Text_shellsafe(Xorriso_lst_get_text(s, 0), sfe, 0));
      Xorriso_status_result(xorriso,filter,fp,flag&2);
    }
@@ -12316,20 +12316,20 @@ int Xorriso_option_disk_pattern(struct XorrisO *xorriso, char *mode, int flag)
 
 /* Option -drive_class */
 int Xorriso_option_drive_class(struct XorrisO *xorriso,
-                               char *class, char *pattern, int flag)
+                               char *d_class, char *pattern, int flag)
 {
  int ret= 1;
 
- if(strcmp(class, "banned") == 0) {
+ if(strcmp(d_class, "banned") == 0) {
    ret= Xorriso_lst_new(&(xorriso->drive_blacklist), pattern,
                           xorriso->drive_blacklist, 1);
- } else if(strcmp(class, "caution") == 0) {
+ } else if(strcmp(d_class, "caution") == 0) {
    ret= Xorriso_lst_new(&(xorriso->drive_greylist), pattern,
                           xorriso->drive_greylist, 1);
- } else if (strcmp(class, "harmless") == 0) {
+ } else if (strcmp(d_class, "harmless") == 0) {
    ret= Xorriso_lst_new(&(xorriso->drive_whitelist), pattern,
                         xorriso->drive_whitelist, 1);
- } else if (strcmp(class, "clear_list") == 0) {
+ } else if (strcmp(d_class, "clear_list") == 0) {
    if(strcmp(pattern, "banned") == 0)
      Xorriso_lst_destroy_all(&(xorriso->drive_blacklist), 0);
    else if(strcmp(pattern, "caution") == 0)
@@ -12348,7 +12348,7 @@ int Xorriso_option_drive_class(struct XorrisO *xorriso,
    }
    ret= 1;
  } else {
-   sprintf(xorriso->info_text, "-drive_class: unknown class '%s'", class);
+   sprintf(xorriso->info_text, "-drive_class: unknown class '%s'", d_class);
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
    return(0);
  }
diff --git a/xorriso/xorriso.h b/xorriso/xorriso.h
index 4d16131f..30b47bf9 100644
--- a/xorriso/xorriso.h
+++ b/xorriso/xorriso.h
@@ -409,6 +409,10 @@ int Xorriso_option_dialog(struct XorrisO *xorriso, char *mode, int flag);
 /* Option -disk_pattern "on"|"ls"|"off" */
 int Xorriso_option_disk_pattern(struct XorrisO *xorriso, char *mode, int flag);
 
+/* Option -drive_class */
+int Xorriso_option_drive_class(struct XorrisO *xorriso,
+                               char *d_class, char *pattern, int flag);
+
 /* Option -dummy "on"|"off" */
 int Xorriso_option_dummy(struct XorrisO *xorriso, char *mode, int flag);
 
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 1377cc54..db05fae8 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2009.01.06.123047"
+#define Xorriso_timestamP "2009.01.10.154018"