X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=707c6c6254b88a359a5297c469a1f3105528e5bc;hp=dfe4e37431226bb80b298b7b676928897e645413;hb=4a0c8e1fb760134609dcf2c06cd1b9b76953d606;hpb=a24d175e6d093d6d9f6e583c3026e45924bad621

diff --git a/blob.c b/blob.c
index dfe4e374..707c6c62 100644
--- a/blob.c
+++ b/blob.c
@@ -16,7 +16,6 @@
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "net.h"
 #include "ipc.h"
 #include "portable_io.h"
 
@@ -81,12 +80,13 @@ static struct osl_column_description blob_cols[] = {
 	DEFINE_BLOB_TABLE_DESC(table_name); \
 	DEFINE_BLOB_TABLE_PTR(table_name);
 
-/** \cond doxygen isn't smart enough to recognize these */
+/* doxygen isn't smart enough to recognize these */
+/** \cond blob_table */
 INIT_BLOB_TABLE(lyrics);
 INIT_BLOB_TABLE(images);
 INIT_BLOB_TABLE(moods);
 INIT_BLOB_TABLE(playlists);
-/** \endcond */
+/** \endcond blob_table */
 
 /** Flags that may be passed to the \p ls functions of each blob  type. */
 enum blob_ls_flags {
@@ -131,7 +131,7 @@ static void com_lsblob_callback(struct osl_table *table,
 	struct lsblob_action_data lbad = {
 		.flags = *(uint32_t *)query->data,
 		.pb = {
-			.max_size = SHMMAX,
+			.max_size = shm_get_shmmax(),
 			.private_data = &fd,
 			.max_size_handler = pass_buffer_as_shm
 		}
@@ -262,7 +262,7 @@ static void com_rmblob_callback(struct osl_table *table, int fd,
 	struct rmblob_data rmbd = {
 		.num_removed = 0,
 		.pb = {
-			.max_size = SHMMAX,
+			.max_size = shm_get_shmmax(),
 			.private_data = &fd,
 			.max_size_handler = pass_buffer_as_shm
 		}
@@ -663,9 +663,10 @@ static int blob_open(struct osl_table **table,
 	DEFINE_GET_DEF_BY_NAME(table_name, cmd_prefix); \
 	DEFINE_GET_NAME_AND_DEF_BY_ROW(table_name, cmd_prefix); \
 
-/** \cond doxygen isn't smart enough to recognize these */
+/* doxygen isn't smart enough to recognize these */
+/** \cond blob_function */
 DEFINE_BLOB_FUNCTIONS(lyrics, lyr);
 DEFINE_BLOB_FUNCTIONS(images, img);
 DEFINE_BLOB_FUNCTIONS(moods, mood);
 DEFINE_BLOB_FUNCTIONS(playlists, pl);
-/** \endcond */
+/** \endcond blob_function */