This patch adds 'static' to all inlined functions in the parser_interface.c file to address Debian bug 756807.
The parser still passed 'make check' when compiled with gcc. I haven't compiled the package with clang to ensure that this is sufficient. Signed-off-by: Seth Arnold <[email protected]> Thanks
=== modified file 'parser/parser_interface.c'
--- parser/parser_interface.c 2014-08-24 06:50:43 +0000
+++ parser/parser_interface.c 2014-08-29 19:04:22 +0000
@@ -186,57 +186,57 @@
};
-inline void sd_write8(std::ostringstream &buf, u8 b)
+static inline void sd_write8(std::ostringstream &buf, u8 b)
{
buf.write((const char *) &b, 1);
}
-inline void sd_write16(std::ostringstream &buf, u16 b)
+static inline void sd_write16(std::ostringstream &buf, u16 b)
{
u16 tmp;
tmp = cpu_to_le16(b);
buf.write((const char *) &tmp, 2);
}
-inline void sd_write32(std::ostringstream &buf, u32 b)
+static inline void sd_write32(std::ostringstream &buf, u32 b)
{
u32 tmp;
tmp = cpu_to_le32(b);
buf.write((const char *) &tmp, 4);
}
-inline void sd_write64(std::ostringstream &buf, u64 b)
+static inline void sd_write64(std::ostringstream &buf, u64 b)
{
u64 tmp;
tmp = cpu_to_le64(b);
buf.write((const char *) &tmp, 8);
}
-inline void sd_write_uint8(std::ostringstream &buf, u8 b)
+static inline void sd_write_uint8(std::ostringstream &buf, u8 b)
{
sd_write8(buf, SD_U8);
sd_write8(buf, b);
}
-inline void sd_write_uint16(std::ostringstream &buf, u16 b)
+static inline void sd_write_uint16(std::ostringstream &buf, u16 b)
{
sd_write8(buf, SD_U16);
sd_write16(buf, b);
}
-inline void sd_write_uint32(std::ostringstream &buf, u32 b)
+static inline void sd_write_uint32(std::ostringstream &buf, u32 b)
{
sd_write8(buf, SD_U32);
sd_write32(buf, b);
}
-inline void sd_write_uint64(std::ostringstream &buf, u64 b)
+static inline void sd_write_uint64(std::ostringstream &buf, u64 b)
{
sd_write8(buf, SD_U64);
sd_write64(buf, b);
}
-inline void sd_write_name(std::ostringstream &buf, const char *name)
+static inline void sd_write_name(std::ostringstream &buf, const char *name)
{
PDEBUG("Writing name '%s'\n", name);
if (name) {
@@ -246,7 +246,7 @@
}
}
-inline void sd_write_blob(std::ostringstream &buf, void *b, int buf_size, char *name)
+static inline void sd_write_blob(std::ostringstream &buf, void *b, int buf_size, char *name)
{
sd_write_name(buf, name);
sd_write8(buf, SD_BLOB);
@@ -257,7 +257,7 @@
static char zeros[64];
#define align64(X) (((X) + (typeof(X)) 7) & ~((typeof(X)) 7))
-inline void sd_write_aligned_blob(std::ostringstream &buf, void *b, int b_size,
+static inline void sd_write_aligned_blob(std::ostringstream &buf, void *b, int b_size,
const char *name)
{
sd_write_name(buf, name);
@@ -277,41 +277,41 @@
buf.write(b, size);
}
-inline void sd_write_string(std::ostringstream &buf, char *b, const char *name)
+static inline void sd_write_string(std::ostringstream &buf, char *b, const char *name)
{
sd_write_strn(buf, b, strlen(b) + 1, name);
}
-inline void sd_write_struct(std::ostringstream &buf, const char *name)
+static inline void sd_write_struct(std::ostringstream &buf, const char *name)
{
sd_write_name(buf, name);
sd_write8(buf, SD_STRUCT);
}
-inline void sd_write_structend(std::ostringstream &buf)
+static inline void sd_write_structend(std::ostringstream &buf)
{
sd_write8(buf, SD_STRUCTEND);
}
-inline void sd_write_array(std::ostringstream &buf, const char *name, int size)
+static inline void sd_write_array(std::ostringstream &buf, const char *name, int size)
{
sd_write_name(buf, name);
sd_write8(buf, SD_ARRAY);
sd_write16(buf, size);
}
-inline void sd_write_arrayend(std::ostringstream &buf)
+static inline void sd_write_arrayend(std::ostringstream &buf)
{
sd_write8(buf, SD_ARRAYEND);
}
-inline void sd_write_list(std::ostringstream &buf, const char *name)
+static inline void sd_write_list(std::ostringstream &buf, const char *name)
{
sd_write_name(buf, name);
sd_write8(buf, SD_LIST);
}
-inline void sd_write_listend(std::ostringstream &buf)
+static inline void sd_write_listend(std::ostringstream &buf)
{
sd_write8(buf, SD_LISTEND);
}
signature.asc
Description: Digital signature
-- AppArmor mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
