From b1231445c7e56f11d77c81c2e027e5fb85631ca0 Mon Sep 17 00:00:00 2001
From: "roel@libnfc.org" <roel@libnfc.org@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Wed, 9 Oct 2013 09:59:14 +0000
Subject: [PATCH] removed unused compiler directives, cleaned up some code
---
client/Makefile | 2 +-
client/cmdhf15.c | 2 --
client/nonce2key/crapto1.c | 26 --------------------------
3 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/client/Makefile b/client/Makefile
index 0d97d41c..382d10f4 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -15,7 +15,7 @@ OBJDIR = obj
LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread ../liblua/liblua.a
LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -fms-extensions -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O4
+CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
LUAPLATFORM = generic
ifneq (,$(findstring MINGW,$(platform)))
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index cbc0ae12..cc61d289 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -45,8 +45,6 @@
#define AddCrc(data,datalen) Iso15693AddCrc(data,datalen)
#define sprintUID(target,uid) Iso15693sprintUID(target,uid)
-static int CmdHelp(const char *Cmd);
-
// structure and database for uid -> tagtype lookups
typedef struct {
uint64_t uid;
diff --git a/client/nonce2key/crapto1.c b/client/nonce2key/crapto1.c
index c509581c..90f55ab4 100644
--- a/client/nonce2key/crapto1.c
+++ b/client/nonce2key/crapto1.c
@@ -95,32 +95,6 @@ static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,
}
}
-
-static void quicksort(uint32_t* const start, uint32_t* const stop)
-{
- uint32_t *it = start + 1, *rit = stop;
-
- if(it > rit)
- return;
-
- while(it < rit)
- if(*it <= *start)
- ++it;
- else if(*rit > *start)
- --rit;
- else
- *it ^= (*it ^= *rit, *rit ^= *it);
-
- if(*rit >= *start)
- --rit;
- if(rit != start)
- *rit ^= (*rit ^= *start, *start ^= *rit);
-
- quicksort(start, rit - 1);
- quicksort(rit + 1, stop);
-}
-
-
/** binsearch
* Binary search for the first occurence of *stop's MSB in sorted [start,stop]
*/
--
2.39.5