summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPali Rohár <pali.rohar@gmail.com>2012-08-10 12:23:54 +0200
committerPali Rohár <pali.rohar@gmail.com>2012-08-10 12:23:54 +0200
commitadbe2dabadda68ca64ce1f7ed6ef675bc76fd52e (patch)
treea757c4b38b7f4881f8f27d38afac8d266397ff1d
parent4b7769a67d45dc716e61f8850c957642b3e09de1 (diff)
download0xFFFF-adbe2dabadda68ca64ce1f7ed6ef675bc76fd52e.tar.bz2
Remove old hexdup.c code
-rw-r--r--src/Makefile2
-rw-r--r--src/dump.c1
-rw-r--r--src/hexdump.c65
-rw-r--r--src/hexdump.h3
-rw-r--r--src/nolo.c4
5 files changed, 2 insertions, 73 deletions
diff --git a/src/Makefile b/src/Makefile
index ed3ef9b..17c3198 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
include ../config.mk
-OBJ=main.o hexdump.o dump.o nolo.o qmode.o
+OBJ=main.o dump.o nolo.o qmode.o
OBJ+=printf-utils.o console.o
OBJ+=squeue/squeue.o
OBJ+=image.o fiasco.o device.o usb-device.o cold-flash.o
diff --git a/src/dump.c b/src/dump.c
index b3270da..894a6d2 100644
--- a/src/dump.c
+++ b/src/dump.c
@@ -22,7 +22,6 @@
#include <string.h>
#include "dump.h"
-#include "hexdump.h"
#include "printf-utils.h"
/*
diff --git a/src/hexdump.c b/src/hexdump.c
deleted file mode 100644
index 4b1a676..0000000
--- a/src/hexdump.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * radare - advanced commandline hexadecimal editor
- * Copyright (C) 2006,2007 pancake <pancake@youterm.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include "hexdump.h"
-
-char getprintablechar(char a)
-{
- if (a>=' '&&a<='~')
- return a;
- return '.';
-}
-
-int is_printable (int c)
-{
- if (c<' '||c>'~') return 0;
- return 1;
-}
-
-/*
- * Helper function
- */
-void dump_bytes(unsigned char *buf, int len)
-{
- int i,j,seek = 0;
- int inc = 16;
-
- for(i=0; i<len; i+=inc) {
- fprintf(stderr, "0x%08x | ", seek+i);
- for(j=i;j<i+inc;j++) {
- if (j>=len) {
- fprintf(stderr, " ");
- continue;
- }
- fprintf(stderr, "%02x ", buf[j]);
- }
- fprintf(stderr, " ");
- for(j=i; j<i+inc; j++) {
- if (j >= len)
- fprintf(stderr, " ");
- else
- if ( is_printable(buf[j]) )
- fprintf(stderr, "%c", buf[j]);
- else fprintf(stderr, ".");
- }
- fprintf(stderr, "\n");
- }
- fflush(stderr);
-}
diff --git a/src/hexdump.h b/src/hexdump.h
deleted file mode 100644
index b28462c..0000000
--- a/src/hexdump.h
+++ /dev/null
@@ -1,3 +0,0 @@
-char getprintablechar(char a);
-int is_printable (int c);
-void dump_bytes(unsigned char *buf, int len);
diff --git a/src/nolo.c b/src/nolo.c
index 54c46e7..b98ec40 100644
--- a/src/nolo.c
+++ b/src/nolo.c
@@ -27,8 +27,6 @@
#include "image.h"
#include "printf-utils.h"
-#include "hexdump.h"
-
#define CMD_WRITE 64
#define CMD_QUERY 192
@@ -53,7 +51,7 @@ static void query_error_message()
if (nolomsg[0] == '\0') {
printf(" (.. silence ..)\n");
} else {
- dump_bytes((unsigned char *)nolomsg, 128);
+// dump_bytes((unsigned char *)nolomsg, 128);
do {
printf(" - %s\n", nolomsg+len);
len+=strlen(nolomsg+len)+1;