From ef3241bbef1af51f26a052299c0a0ad2ff2d9a01 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Sat, 30 Jul 2016 19:58:35 -0700 Subject: Define local functions static to avoid collisions. --- ldid.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ldid.cpp b/ldid.cpp index a33cb55..c535460 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -459,15 +459,15 @@ struct encryption_info_command { #define BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED 0xb0 #define BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB 0xc0 -inline void get(std::streambuf &stream, void *data, size_t size) { +static inline void get(std::streambuf &stream, void *data, size_t size) { _assert(stream.sgetn(static_cast(data), size) == size); } -inline void put(std::streambuf &stream, const void *data, size_t size) { +static inline void put(std::streambuf &stream, const void *data, size_t size) { _assert(stream.sputn(static_cast(data), size) == size); } -inline void pad(std::streambuf &stream, size_t size) { +static inline void pad(std::streambuf &stream, size_t size) { char padding[size]; memset(padding, 0, size); put(stream, padding, size); @@ -1907,7 +1907,7 @@ struct RuleCode { }; #ifndef LDID_NOPLIST -void Sign(std::streambuf &buffer, std::vector &hash, std::streambuf &save, const std::string &identifier, const std::string &entitlements, const std::string &key, const Slots &slots) { +static void Sign(std::streambuf &buffer, std::vector &hash, std::streambuf &save, const std::string &identifier, const std::string &entitlements, const std::string &key, const Slots &slots) { // XXX: this is a miserable fail std::stringbuf temp; copy(buffer, temp); -- cgit v1.2.3-56-ge451