aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid M. Syzdek <syzdek@bindlebinaries.com>2017-07-08 22:35:36 -0800
committerDavid M. Syzdek <syzdek@bindlebinaries.com>2017-07-08 22:35:36 -0800
commitfcd70be6074b2a56f6b2c92e02d968e530c9b80a (patch)
treef2e244fd75808bf5ad0c8559938a9b8642f5ef76
parent83a5fe5cfd48bf46896a29a15669021945e126f4 (diff)
downloadsecurecoreutils-fcd70be6074b2a56f6b2c92e02d968e530c9b80a.tar.gz
securecoreutils-fcd70be6074b2a56f6b2c92e02d968e530c9b80a.tar.bz2
securecoreutils-fcd70be6074b2a56f6b2c92e02d968e530c9b80a.tar.xz
securecoreutils-fcd70be6074b2a56f6b2c92e02d968e530c9b80a.zip
Removing helpers.h from LZW library.
-rw-r--r--Makefile.am1
-rw-r--r--securecoreutilities.xcodeproj/project.pbxproj2
-rw-r--r--src/lzw/helpers.h24
-rw-r--r--src/lzw/lzw_internal.h2
4 files changed, 1 insertions, 28 deletions
diff --git a/Makefile.am b/Makefile.am
index 1960983..92f4a98 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,7 +113,6 @@ src_securecoreutils_SOURCES = $(include_HEADERS) \
113 src/widget-zcat.c \ 113 src/widget-zcat.c \
114 src/widget-zcat.h \ 114 src/widget-zcat.h \
115 src/lzw/headers.h \ 115 src/lzw/headers.h \
116 src/lzw/helpers.h \
117 src/lzw/lzw.c \ 116 src/lzw/lzw.c \
118 src/lzw/lzw.h \ 117 src/lzw/lzw.h \
119 src/lzw/lzw_internal.h 118 src/lzw/lzw_internal.h
diff --git a/securecoreutilities.xcodeproj/project.pbxproj b/securecoreutilities.xcodeproj/project.pbxproj
index e0f64f6..cc21dba 100644
--- a/securecoreutilities.xcodeproj/project.pbxproj
+++ b/securecoreutilities.xcodeproj/project.pbxproj
@@ -75,7 +75,6 @@
75 A0446A391F0F12BA000085C7 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; }; 75 A0446A391F0F12BA000085C7 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
76 A0446A3A1F0F12BA000085C7 /* UNLICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = UNLICENSE; sourceTree = "<group>"; }; 76 A0446A3A1F0F12BA000085C7 /* UNLICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = UNLICENSE; sourceTree = "<group>"; };
77 A0446A3B1F0F12BA000085C7 /* headers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = headers.h; sourceTree = "<group>"; }; 77 A0446A3B1F0F12BA000085C7 /* headers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = headers.h; sourceTree = "<group>"; };
78 A0446A3C1F0F12BA000085C7 /* helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = helpers.h; sourceTree = "<group>"; };
79 A0446A3D1F0F12BA000085C7 /* lzw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lzw.c; sourceTree = "<group>"; }; 78 A0446A3D1F0F12BA000085C7 /* lzw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lzw.c; sourceTree = "<group>"; };
80 A0446A3E1F0F12BA000085C7 /* lzw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lzw.h; sourceTree = "<group>"; }; 79 A0446A3E1F0F12BA000085C7 /* lzw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lzw.h; sourceTree = "<group>"; };
81 A0446A3F1F0F12BA000085C7 /* lzw_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lzw_internal.h; sourceTree = "<group>"; }; 80 A0446A3F1F0F12BA000085C7 /* lzw_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lzw_internal.h; sourceTree = "<group>"; };
@@ -132,7 +131,6 @@
132 A0446A391F0F12BA000085C7 /* README.md */, 131 A0446A391F0F12BA000085C7 /* README.md */,
133 A0446A3A1F0F12BA000085C7 /* UNLICENSE */, 132 A0446A3A1F0F12BA000085C7 /* UNLICENSE */,
134 A0446A3B1F0F12BA000085C7 /* headers.h */, 133 A0446A3B1F0F12BA000085C7 /* headers.h */,
135 A0446A3C1F0F12BA000085C7 /* helpers.h */,
136 A0446A3D1F0F12BA000085C7 /* lzw.c */, 134 A0446A3D1F0F12BA000085C7 /* lzw.c */,
137 A0446A3E1F0F12BA000085C7 /* lzw.h */, 135 A0446A3E1F0F12BA000085C7 /* lzw.h */,
138 A0446A3F1F0F12BA000085C7 /* lzw_internal.h */, 136 A0446A3F1F0F12BA000085C7 /* lzw_internal.h */,
diff --git a/src/lzw/helpers.h b/src/lzw/helpers.h
deleted file mode 100644
index 4ba45f7..0000000
--- a/src/lzw/helpers.h
+++ /dev/null
@@ -1,24 +0,0 @@
1/*
2 * Written by Mike Frysinger <vapier@gmail.com>
3 * Released into the public domain
4 */
5
6#ifndef _LIBLZW_HELPERS_H
7#define _LIBLZW_HELPERS_H
8
9#define _warn(fmt, args...) fprintf(stderr, fmt , ## args)
10#define warn(fmt, args...) _warn("liblzw: " fmt "\n" , ## args)
11#define warnf(fmt, args...) warn("%s(): " fmt, __FUNCTION__ , ## args)
12#define warnp(fmt, args...) warn(fmt ": %s" , ## args , strerror(errno))
13#define warnfp(fmt, args...) warnp("%s(): " fmt, __FUNCTION__ , ## args)
14
15#define dumphex(buf, cnt) \
16 do { \
17 size_t i = 0; \
18 _warn("dumphex: "); \
19 while (i < cnt) \
20 _warn("%2.2X ", buf[i++]); \
21 _warn("\n"); \
22 } while (0)
23
24#endif /* _LIBLZW_HELPERS_H */
diff --git a/src/lzw/lzw_internal.h b/src/lzw/lzw_internal.h
index 14db19c..5d4f9dc 100644
--- a/src/lzw/lzw_internal.h
+++ b/src/lzw/lzw_internal.h
@@ -11,6 +11,6 @@
11#define __IN_LIBLZW 11#define __IN_LIBLZW
12#include "lzw.h" 12#include "lzw.h"
13 13
14#include "helpers.h" 14//#include "helpers.h"
15 15
16#endif /* _LIBLZW_INTERNAL_H */ 16#endif /* _LIBLZW_INTERNAL_H */