From: leslie <unknown>
Date: Tue, 8 Jan 2008 17:24:14 +0000 (+0100)
Subject: fix more gcc 4.x warnings
X-Git-Tag: 0.9.0~39
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=ff8101d1a4496b89e3531edc22b270c0c5f067e3;p=sasc-ng.git

fix more gcc 4.x warnings
---

diff --git a/smartcard.h b/smartcard.h
index 184cef4..56fd6e8 100644
--- a/smartcard.h
+++ b/smartcard.h
@@ -96,7 +96,7 @@ struct CardConfig {
 
 struct StatusMsg {
   unsigned char sb[SB_LEN];
-  char *message; 
+  const char *message; 
   bool retval;
   };
 
diff --git a/systems/sc-cryptoworks/sc-cryptoworks.c b/systems/sc-cryptoworks/sc-cryptoworks.c
index 4d29eba..9f16889 100644
--- a/systems/sc-cryptoworks/sc-cryptoworks.c
+++ b/systems/sc-cryptoworks/sc-cryptoworks.c
@@ -296,7 +296,7 @@ bool cSmartCardCryptoworks::Init(void)
                  atr->hist[2],atr->hist[3],caid,HexStr(str,&buff[2],5));
   PRINTF(L_SC_INIT,"card v.%d (pindown=%d) caid %04x serial %s MF %04X",atr->hist[2],atr->hist[3],caid,HexStr(str,&buff[2],5),mfid);
   if(ReadRecord(buff,0x9F)>=3) {
-    char *n="(unknown)";
+    const char *n="(unknown)";
     if(ReadRecord(buff+10,0xC0)>=18) n=(char *)buff+10+2;
     infoStr.Printf("Issuer:     0x%02x (%.16s)\n",buff[2],n);
     PRINTF(L_SC_INIT,"card issuer: 0x%02x %.16s",buff[2],n);
@@ -348,7 +348,7 @@ bool cSmartCardCryptoworks::Init(void)
     }
   for(unsigned int i=0; i<count ; i++) {
     if(SelectFile(0x1F00+provId[i])) {
-      char *n="(unknown)";
+      const char *n="(unknown)";
       if(SelectFile(0x0E11) && ReadRecord(buff,0xD6)>=18) n=(char *)buff+2;
       infoStr.Printf("Provider %d: 0x%02x (%.16s)\n",i,provId[i],n);
       PRINTF(L_SC_INIT,"provider %d: 0x%02x %.16s",i,provId[i],n);
diff --git a/systems/sc-seca/sc-seca.c b/systems/sc-seca/sc-seca.c
index c994857..763da5f 100644
--- a/systems/sc-seca/sc-seca.c
+++ b/systems/sc-seca/sc-seca.c
@@ -196,7 +196,7 @@ bool cSmartCardSeca::Init(void)
 
   infoStr.Begin();
   infoStr.Strcat("Seca smartcard\n");
-  char *type;
+  const char *type;
   switch(atr->hist[0]*256+atr->hist[1]) {
     case 0x5084: type="Generic"; break;
     case 0x5384: type="Philips"; break;
diff --git a/systems/sc-viaccess/sc-viaccess.c b/systems/sc-viaccess/sc-viaccess.c
index dc18fb2..c6298cf 100644
--- a/systems/sc-viaccess/sc-viaccess.c
+++ b/systems/sc-viaccess/sc-viaccess.c
@@ -148,7 +148,7 @@ bool cSmartCardViaccess::Init(void)
 
   infoStr.Begin();
   infoStr.Strcat("Viaccess smartcard\n");
-  char *ver=0;
+  const char *ver=0;
   switch((atr->hist[3]<<8)|atr->hist[4]) {
     case 0x6268: ver="2.3"; break;
     case 0x6468:
diff --git a/systems/viaccess/st20.c b/systems/viaccess/st20.c
index eccbe7e..bbee87b 100644
--- a/systems/viaccess/st20.c
+++ b/systems/viaccess/st20.c
@@ -246,7 +246,7 @@ void cST20::LogOpOper(int op, int oper)
   else            loglb->Printf("%*s%-5s  %-8d ",max(OP_COL-n,1)," ",cmds[op],oper);
 }
 
-void cST20::LogOp(char *op)
+void cST20::LogOp(const char *op)
 {
   int n=loglb->Length();
   loglb->Printf("%*s%-15s ",max(OP_COL-n,1)," ",op);
diff --git a/systems/viaccess/st20.h b/systems/viaccess/st20.h
index 12eced0..ae70ab5 100644
--- a/systems/viaccess/st20.h
+++ b/systems/viaccess/st20.h
@@ -58,7 +58,7 @@ private:
   cLineBuff *loglb;
   //
   unsigned char *Addr(unsigned int off);
-  void LogOp(char *op);
+  void LogOp(const char *op);
   void LogOpOper(int op, int oper);
 public:
   cST20(void);