striker 01/06/30 01:21:50
Modified: include apr_sms.h
Log:
Replaced the APR_ALIGN macro with nicer one.
Cleaned up some stray tab characters.
Revision Changes Path
1.19 +15 -12 apr/include/apr_sms.h
Index: apr_sms.h
===================================================================
RCS file: /home/cvs/apr/include/apr_sms.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- apr_sms.h 2001/06/29 18:29:40 1.18
+++ apr_sms.h 2001/06/30 08:21:50 1.19
@@ -60,8 +60,8 @@
* May 2001
*/
-#ifndef APR_MEMORY_SYSTEM_H
-#define APR_MEMORY_SYSTEM_H
+#ifndef APR_SMS_H
+#define APR_SMS_H
#include "apr.h"
#include "apr_errno.h"
@@ -77,9 +77,13 @@
#define APR_CHILD_CLEANUP 0x0001
#define APR_PARENT_CLEANUP 0x0002
-/* Alignment macro's */
+/* Alignment macro's
+ *
+ * APR_ALIGN is only to be used to align on a power
+ * of two boundary
+ */
#define APR_ALIGN(size, boundary) \
- ((size) + (((boundary) - ((size) & ((boundary) - 1))) & ((boundary) -
1)))
+ (((size) + ((boundary) - 1)) & ~((boundary) - 1))
#define APR_ALIGN_DEFAULT(size) APR_ALIGN(size, 8)
@@ -162,8 +166,7 @@
* @param sms The memory system to use (should be the same as the
* one that returned the block)
* @param mem The block of memory to be freed
- * @deffunc void apr_sms_free(apr_sms_t *sms,
- * void *mem)
+ * @deffunc void apr_sms_free(apr_sms_t *sms, void *mem)
*/
APR_DECLARE(apr_status_t) apr_sms_free(apr_sms_t *sms, void *mem);
@@ -180,7 +183,7 @@
* @param sms The memory system created
* @param parent_sms The parent memory system
* @deffunc apr_status_t apr_sms_init(apr_sms_t *sms,
- * apr_sms_t *parent_sms)
+ * apr_sms_t *parent_sms)
*/
APR_DECLARE(apr_status_t) apr_sms_init(apr_sms_t *sms,
apr_sms_t *parent_sms);
@@ -247,7 +250,7 @@
* @param b The memory system to search for
* @return APR_SUCCESS if a is an ancestor of b, 1 if it isn't
* @deffunc apr_status_t apr_sms_is_ancestor(apr_sms_t *a,
- * apr_sms_t *b)
+ * apr_sms_t *b)
*/
APR_DECLARE(apr_status_t) apr_sms_is_ancestor(apr_sms_t *a, apr_sms_t *b);
@@ -276,7 +279,7 @@
* @param cleanup_fn The function to call when the memory system is reset or
* destroyed
* @deffunc void apr_sms_cleanup_register(apr_sms_t *sms, apr_int32_t type,
- * void *data, apr_status_t (*cleanup_fn)(void *));
+ * void *data, apr_status_t (*cleanup_fn)(void *));
*/
APR_DECLARE(apr_status_t) apr_sms_cleanup_register(apr_sms_t *sms,
apr_int32_t type,
void *data,
@@ -290,7 +293,7 @@
* @param data The data associated with the cleanup function
* @param cleanup_fn The registered cleanup function
* @deffunc void apr_sms_cleanup_unregister(apr_sms_t *sms,
- * void *data, apr_status_t (*cleanup_fn)(void *));
+ * void *data, apr_status_t (*cleanup_fn)(void *));
*/
APR_DECLARE(apr_status_t) apr_sms_cleanup_unregister(apr_sms_t *sms,
apr_int32_t type,
void *data,
@@ -328,7 +331,7 @@
* @param type The category of cleanup functions to run. Pass 0 to run all
* cleanup functions.
* @deffunc apr_status_t apr_sms_cleanup_run_type(apr_sms_t *sms,
- * apr_int32_t type);
+ * apr_int32_t type);
*/
APR_DECLARE(apr_status_t) apr_sms_cleanup_run_type(apr_sms_t *sms,
apr_int32_t type);
@@ -344,5 +347,5 @@
}
#endif
-#endif /* !APR_MEMORY_SYSTEM_H */
+#endif /* !APR_SMS_H */
