diff --git a/Sorting/7Ex/main.o b/Sorting/7Ex/main.o deleted file mode 100644 index c6ebb1f..0000000 Binary files a/Sorting/7Ex/main.o and /dev/null differ diff --git a/Sorting/7Ex/quicksort.o b/Sorting/7Ex/quicksort.o deleted file mode 100644 index b59dd0b..0000000 Binary files a/Sorting/7Ex/quicksort.o and /dev/null differ diff --git a/Sorting/7Ex/seagwithsob.o b/Sorting/7Ex/seagwithsob.o deleted file mode 100644 index 6e86ed7..0000000 Binary files a/Sorting/7Ex/seagwithsob.o and /dev/null differ diff --git a/Sorting/7Ex/tools.c b/Sorting/7Ex/tools.c index 7465f29..5b58c2b 100644 --- a/Sorting/7Ex/tools.c +++ b/Sorting/7Ex/tools.c @@ -141,12 +141,12 @@ bool more(double a, double b) { } int compare(const void * ufirst, const void * usecond) { - double first = (double)ufirst; - double second = (double)usecond; + double first = *(double *)ufirst; + double second = *(double *)usecond; - if ((first - second) > eps) { + if ((first - second) > exp) { return 1; - } else ((second - first) > eps) { + } else if ((second - first) > exp) { return -1; } else { return 0; diff --git a/WorkingArrays/9Ex/makefile b/WorkingArrays/9Ex/makefile index 556c520..52f7ed8 100644 --- a/WorkingArrays/9Ex/makefile +++ b/WorkingArrays/9Ex/makefile @@ -12,7 +12,6 @@ CFLAGS = -mfpmath=sse \ -Wpointer-arith \ -Wformat-security \ -Wmissing-format-attribute \ - -Wformat=1 \ -Wwrite-strings \ -Wcast-align \ -Wno-long-long \ @@ -24,20 +23,19 @@ CFLAGS = -mfpmath=sse \ -Wdeclaration-after-statement \ -Wbad-function-cast \ -Wnested-externs \ - -O3 \ - -D_DEBUG -g \ - -c - + -O3 \ + -D_DEBUG -g \ + -c all: main.o grouping.o tools.o - gcc main.o grouping.o tools.o -lssp && del *.o - a.exe + gcc main.o grouping.o tools.o -o a.out && rm -f *.o + ./a.out main.o: main.c - gcc $(CFLAGS) main.c + gcc $(CFLAGS) main.c -o main.o grouping.o: grouping.c - gcc $(CFLAGS) grouping.c + gcc $(CFLAGS) grouping.c -o grouping.o tools.o: tools.c - gcc $(CFLAGS) tools.c + gcc $(CFLAGS) tools.c -o tools.o