ucx: comparison src/cx/properties.h

-:8b0f162ac88e
+:36c0fb2b60b2
 #include "common.h"
 #include "string.h"
 #include "map.h"
 #include "buffer.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
 /**
 * Configures the expected characters for the properties parser.
 */
 struct cx_properties_config_s {
 /**
 *
 * @param prop the properties interface
 * @param config the properties configuration
 * @see cxPropertiesInitDefault()
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT void cxPropertiesInit(CxProperties *prop, CxPropertiesConfig config);
+void cxPropertiesInit(CxProperties *prop, CxPropertiesConfig config);
 /**
 * Destroys the properties interface.
 *
 * @note Even when you are certain that you did not use the interface in a
 * and you really don't want to search the entire code where you might need to
 * add a call to this function.
 *
 * @param prop the properties interface
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT void cxPropertiesDestroy(CxProperties *prop);
+void cxPropertiesDestroy(CxProperties *prop);
 /**
 * Destroys and re-initializes the properties interface.
 *
 * You might want to use this to reset the parser after
 * encountering a syntax error.
 *
 * @param prop the properties interface
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT void cxPropertiesReset(CxProperties *prop);
+void cxPropertiesReset(CxProperties *prop);
 /**
 * Initialize a properties parser with the default configuration.
 *
 * @param prop (@c CxProperties*) the properties interface
 * @param len the length of the data
 * @retval zero success
 * @retval non-zero a memory allocation was necessary but failed
 * @see cxPropertiesFill()
 */
-cx_attr_nonnull cx_attr_access_r(2, 3)
+CX_EXTERN CX_NONNULL CX_ACCESS_R(2, 3)
-CX_EXPORT int cxPropertiesFilln(CxProperties *prop, const char *buf, size_t len);
+int cxPropertiesFilln(CxProperties *prop, const char *buf, size_t len);
 /**
 * Internal function, do not use.
 *
 * @param prop the properties interface
 * @param str the text to fill in
 * @retval zero success
 * @retval non-zero a memory allocation was necessary but failed
 */
-cx_attr_nonnull
+CX_NONNULL CX_INLINE
-CX_INLINE int cx_properties_fill(CxProperties *prop, cxstring str) {
+int cx_properties_fill(CxProperties *prop, cxstring str) {
 return cxPropertiesFilln(prop, str.ptr, str.length);
 }
 /**
 * Fills the input buffer with data.
 *
 * @param prop the properties interface
 * @param buf a pointer to stack memory
 * @param capacity the capacity of the stack memory
 */
-cx_attr_nonnull
+CX_EXTERN CX_NONNULL
-CX_EXPORT void cxPropertiesUseStack(CxProperties *prop, char *buf, size_t capacity);
+void cxPropertiesUseStack(CxProperties *prop, char *buf, size_t capacity);
 /**
 * Retrieves the next key/value-pair.
 *
 * This function returns zero as long as there are key/value-pairs found.
 * @retval CX_PROPERTIES_NULL_INPUT the input buffer was never filled
 * @retval CX_PROPERTIES_INVALID_EMPTY_KEY the properties data contains an illegal empty key
 * @retval CX_PROPERTIES_INVALID_MISSING_DELIMITER the properties data contains a line without delimiter
 * @retval CX_PROPERTIES_BUFFER_ALLOC_FAILED an internal allocation was necessary but failed
 */
-cx_attr_nonnull cx_attr_nodiscard
+CX_EXTERN CX_NONNULL CX_NODISCARD
-CX_EXPORT CxPropertiesStatus cxPropertiesNext(CxProperties *prop, cxstring *key, cxstring *value);
+CxPropertiesStatus cxPropertiesNext(CxProperties *prop, cxstring *key, cxstring *value);
 /**
 * The size of the stack memory that `cxPropertiesLoad()` will reserve with `cxPropertiesUseStack()`.
 */
 CX_EXPORT extern const unsigned cx_properties_load_buf_size;
 * @param filename the file name
 * @param target the target map
 * @param config the parser config
 * @return status code
 */
-cx_attr_nonnull_arg(3)
+CX_EXTERN CX_NONNULL_ARG(3)
-CX_EXPORT CxPropertiesStatus cx_properties_load(const CxAllocator *allocator,
+CxPropertiesStatus cx_properties_load(const CxAllocator *allocator,
 cxstring filename, CxMap *target, CxPropertiesConfig config);
 /**
 * Loads properties from a file and inserts them into a map.
 *
 * @see cxPropertiesLoad()
 */
 #define cxPropertiesLoadDefault(allocator, filename, target) \
 cx_properties_load(allocator, cx_strcast(filename), target, cx_properties_config_default)
-#ifdef __cplusplus
-} // extern "C"
-#endif
 #endif // UCX_PROPERTIES_H

Mercurial > hg > ucx / file comparison

comparison: src/cx/properties.h

src/cx/properties.h