From: <svn...@op...> - 2009-07-13 10:24:04
|
Author: bellmich Date: Mon Jul 13 12:23:54 2009 New Revision: 1167 URL: http://libsyncml.opensync.org/changeset/1167 Log: enabled still required parts of sml_error.c Modified: trunk/libsyncml/CMakeLists.txt trunk/libsyncml/sml_error.c trunk/libsyncml/sml_error_internals.h Modified: trunk/libsyncml/CMakeLists.txt ============================================================================== --- trunk/libsyncml/CMakeLists.txt Mon Jul 13 12:23:31 2009 (r1166) +++ trunk/libsyncml/CMakeLists.txt Mon Jul 13 12:23:54 2009 (r1167) @@ -5,6 +5,7 @@ SET( libsyncml_LIB_SRCS sml_command.c sml_elements.c + sml_error.c sml_manager.c sml_md5.c sml_notification.c @@ -67,16 +68,8 @@ INSTALL( TARGETS syncml DESTINATION ${LIBSYNCML_LIBRARIES_DIR} ) INSTALL( FILES - objects/sml_devinf_obj.h - objects/sml_ds_server.h - objects/sml_auth.h sml_defines.h - sml_manager.h - sml_md5.h - sml_notification.h - sml_parse.h - sml_session.h - sml_transport.h + sml_error.h syncml.h DESTINATION ${LIBSYNCML_INCLUDE_DIR}/libsyncml ) Modified: trunk/libsyncml/sml_error.c ============================================================================== --- trunk/libsyncml/sml_error.c Mon Jul 13 12:23:31 2009 (r1166) +++ trunk/libsyncml/sml_error.c Mon Jul 13 12:23:54 2009 (r1167) @@ -191,6 +191,7 @@ * @param args The arguments to the message * */ +/* void smlErrorSetVargs(SmlError **error, SmlErrorType type, const char *format, va_list args) { return_if_fail(error); @@ -219,6 +220,7 @@ return; } +*/ /*@}*/ @@ -229,7 +231,7 @@ * */ /*@{*/ - +/* SmlError **smlErrorRef(SmlError **error) { if (!smlErrorIsSet(error)) @@ -239,7 +241,9 @@ return error; } +*/ +/* void smlErrorDeref(SmlError **error) { if (!smlErrorIsSet(error)) @@ -258,6 +262,7 @@ smlSafeFree((gpointer *)error); } +*/ /*! @brief Checks if the error is set * @@ -282,6 +287,7 @@ * @returns The type of the error * */ +/* SmlErrorType smlErrorGetType(SmlError **error) { if (!smlErrorIsSet(error)) @@ -289,6 +295,7 @@ return (*error)->type; } +*/ /*! @brief Returns the message of the error * @@ -296,6 +303,7 @@ * @returns The message of the error or NULL if no error * */ +/* const char *smlErrorPrint(SmlError **error) { if (!smlErrorIsSet(error)) @@ -303,6 +311,7 @@ return (*error)->printMessage; } +*/ /*! @brief Updates the error message * @@ -314,6 +323,7 @@ * @param format The new message * */ +/* void smlErrorUpdate(SmlError **error, const char *format, ...) { return_if_fail(smlErrorIsSet(error)); @@ -326,6 +336,7 @@ smlSafeCFree(&old); } +*/ /*! @brief Duplicates the error into the target * @@ -334,6 +345,7 @@ * @param source The source error which to duplicate * */ +/* void smlErrorDuplicate(SmlError **target, SmlError **source) { return_if_fail(target != NULL); @@ -342,6 +354,7 @@ smlErrorSet(target, (*source)->type, (*source)->message); } +*/ /*! @brief Sets the error * @@ -352,6 +365,7 @@ * @param format The message * */ +/* void smlErrorSet(SmlError **error, SmlErrorType type, const char *format, ...) { va_list args; @@ -359,6 +373,7 @@ smlErrorSetVargs(error, type, format, args); va_end (args); } +*/ /*! @brief Sets the type of an error * @@ -366,12 +381,14 @@ * @param type The Error type to set * */ +/* void smlErrorSetType(SmlError **error, SmlErrorType type) { return_if_fail(error != NULL); (*error)->type = type; } +*/ /*! @brief Gets the error class * Modified: trunk/libsyncml/sml_error_internals.h ============================================================================== --- trunk/libsyncml/sml_error_internals.h Mon Jul 13 12:23:31 2009 (r1166) +++ trunk/libsyncml/sml_error_internals.h Mon Jul 13 12:23:54 2009 (r1167) @@ -38,6 +38,8 @@ *d_error = NULL; \ } +const char *smlErrorTypeGetMessage(SmlErrorType type); + #endif //_SML_ERROR_INTERNALS_H_ /*@}*/ |