Author: lkajan-guest Date: 2012-10-08 19:33:14 +0000 (Mon, 08 Oct 2012) New Revision: 12347
Modified: trunk/packages/ffindex/trunk/debian/README.source trunk/packages/ffindex/trunk/debian/patches/basename Log: fixed missing header line Modified: trunk/packages/ffindex/trunk/debian/README.source =================================================================== --- trunk/packages/ffindex/trunk/debian/README.source 2012-10-08 19:23:21 UTC (rev 12346) +++ trunk/packages/ffindex/trunk/debian/README.source 2012-10-08 19:33:14 UTC (rev 12347) @@ -1,6 +1,10 @@ ffindex for Debian ------------------ +O: libffindex0: shlib-with-executable-stack usr/lib/libffindex.so.0.1.0 +....................................................................... +This is real, src/ffindex.c contains a nested function(!). + Patches ....... Patches are documented in their headers. Modified: trunk/packages/ffindex/trunk/debian/patches/basename =================================================================== --- trunk/packages/ffindex/trunk/debian/patches/basename 2012-10-08 19:23:21 UTC (rev 12346) +++ trunk/packages/ffindex/trunk/debian/patches/basename 2012-10-08 19:33:14 UTC (rev 12347) @@ -128,3 +128,23 @@ size_t nbytes = sizeof(ffindex_index_t) + (sizeof(ffindex_entry_t) * num_max_entries); ffindex_index_t *index = (ffindex_index_t *)malloc(nbytes); if(index == NULL) +--- a/src/ffindex.h ++++ b/src/ffindex.h +@@ -22,6 +22,8 @@ + #include <stdio.h> + + #define FFINDEX_VERSION 0.980 ++// lkajan: with ~72 bytes per entry, the below makes a default allocation over 2G. malloc in ffindex.c:225 fails on a machine with 'only' 2G of RAM. ++// lkajan: let the default remain 40000000, and let the actual value be controlled by the env var FFINDEX_MAX_INDEX_ENTRIES wherever FFINDEX_MAX_INDEX_ENTRIES_DEFAULT is used. + #define FFINDEX_MAX_INDEX_ENTRIES_DEFAULT 40000000 + #define FFINDEX_MAX_ENTRY_NAME_LENTH 32 + +@@ -45,6 +47,8 @@ + ffindex_entry_t entries[]; /* This array is as big as the excess memory allocated for this struct. */ + } ffindex_index_t; + ++inline size_t ffindex_max_index_entries(){ char *FMIE = getenv("FFINDEX_MAX_INDEX_ENTRIES"); if( FMIE ) { return atol( FMIE ); } else { return FFINDEX_MAX_INDEX_ENTRIES_DEFAULT; } } ++ + int ffindex_insert_memory(FILE *data_file, FILE *index_file, size_t *offset, char *from_start, size_t from_length, char *name); + + int ffindex_insert_file(FILE *data_file, FILE *index_file, size_t *offset, const char *path, char *name); _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit