remove leftover gcc'isms

diff --git a/diff.exclude b/diff.exclude
index acb976391b5aa2e9ea19f01369a75d349bc95365..36161cd76e2075c3b67a90c68043cd6f19534cc7 100644 (file)
--- a/diff.exclude
+++ b/diff.exclude
@@ -13,3 +13,4 @@ diff.exclude
 *.pot
 dump.txt
 .hg
+version.c

diff --git a/systems/cardclient/aroureos.c b/systems/cardclient/aroureos.c
index 93c44bb25421d9260d8766a93d2971271d16eccb..d34544deacf0324563d0dcdd24636a8f0237935a 100644 (file)
--- a/systems/cardclient/aroureos.c
+++ b/systems/cardclient/aroureos.c
@@ -90,7 +90,7 @@ bool cCardClientAroureos::ProcessEMM(int caSys, const unsigned char *source)
       const int length=SCT_LEN(source);
       int id=msEMM.Get(source,length,0);
       if(id>0) {
-        unsigned char buff[length+8];
+        unsigned char *buff=AUTOMEM(length+8);
         memcpy(buff,"EMM",3);
         memcpy(&buff[3],source,length);
         SendMsg(&so,buff,length+3);

diff --git a/systems/viaccess/viaccess.c b/systems/viaccess/viaccess.c
index 96b2ba9ee48cb00cae9afc4f8fe36bff24dc77af..23f21675103061be4bce5318a2416583a9209ab6 100644 (file)
--- a/systems/viaccess/viaccess.c
+++ b/systems/viaccess/viaccess.c
@@ -111,7 +111,10 @@ cString cPlainKeyVia::PrintKeyNr(void)
   switch(keynr) {
     case MBC3('T','P','S'):
       kn="TPS"; break;
-    case MBC3('M','K',0) ... MBC3('M','K',9):
+    case MBC3('M','K',0): case MBC3('M','K',1): case MBC3('M','K',2):
+    case MBC3('M','K',3): case MBC3('M','K',4): case MBC3('M','K',5):
+    case MBC3('M','K',6): case MBC3('M','K',7): case MBC3('M','K',8):
+    case MBC3('M','K',9):
       snprintf(tmp,sizeof(tmp),"MK%d",C3(keynr)); break;
     default:
       snprintf(tmp,sizeof(tmp),"%02X",keynr); break;