summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2011-11-05 14:51:51 -0400
committerTheodore Ts'o <tytso@mit.edu>2011-11-05 14:55:30 -0400
commitd1b75fd60c255ebc07209a5928dff497f58cd745 (patch)
treea2afc290b6388a064bdab9b6199098cc2fdad962
parent6b967cd6f13491dbe07380600f86ed992e833fc9 (diff)
downloade2fsprogs-d1b75fd60c255ebc07209a5928dff497f58cd745.tar.gz
libext2fs: don't leak tdb_null out of the shared library namespace
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r--debian/e2fslibs.symbols1
-rw-r--r--lib/ext2fs/tdb.c4
-rw-r--r--lib/ext2fs/tdb.h2
3 files changed, 2 insertions, 5 deletions
diff --git a/debian/e2fslibs.symbols b/debian/e2fslibs.symbols
index 1cd4246a..040b5712 100644
--- a/debian/e2fslibs.symbols
+++ b/debian/e2fslibs.symbols
@@ -515,7 +515,6 @@ libext2fs.so.2 e2fslibs #MINVER#
qcow2_write_raw_image@Base 1.41.99
set_undo_io_backing_manager@Base 1.41.0
set_undo_io_backup_file@Base 1.41.0
- tdb_null@Base 1.40
test_io_backing_manager@Base 1.37
test_io_cb_read_blk64@Base 1.41.0
test_io_cb_read_blk@Base 1.37
diff --git a/lib/ext2fs/tdb.c b/lib/ext2fs/tdb.c
index 28d40c50..25ce7924 100644
--- a/lib/ext2fs/tdb.c
+++ b/lib/ext2fs/tdb.c
@@ -108,6 +108,8 @@ typedef int bool;
#include "tdb.h"
+static TDB_DATA tdb_null;
+
#ifndef u32
#define u32 unsigned
#endif
@@ -3058,8 +3060,6 @@ int tdb_printfreelist(struct tdb_context *tdb)
/* file: tdb.c */
-TDB_DATA tdb_null;
-
/*
non-blocking increment of the tdb sequence number if the tdb has been opened using
the TDB_SEQNUM flag
diff --git a/lib/ext2fs/tdb.h b/lib/ext2fs/tdb.h
index bfcd9436..732ef0ec 100644
--- a/lib/ext2fs/tdb.h
+++ b/lib/ext2fs/tdb.h
@@ -206,8 +206,6 @@ void tdb_dump_all(struct tdb_context *tdb);
int tdb_printfreelist(struct tdb_context *tdb);
int tdb_validate_freelist(struct tdb_context *tdb, int *pnum_entries);
-extern TDB_DATA tdb_null;
-
#ifdef __cplusplus
}
#endif