TheCount's "Cleanup and bugfixes", merge-able

.gitignore

@@ -1,5 +1,10 @@
 # Debian Packaging
 /.pc/
+/debian/files
+/debian/libsml1/
+/debian/libsml-dev/
+/debian/*.debhelper*
+/debian/*.substvars
 
 # Binaries
 /test/test
@@ -19,3 +24,6 @@
 *.la
 *.a
 
+# Editor files
+*~
+*.swp

examples/Makefile

@@ -1,5 +1,5 @@
 UNAME := $(shell uname)
-CFLAGS += -I../sml/include/ -g -Wall
+CFLAGS += -I../sml/include/ -g -std=c99 -Wall -Wextra -pedantic
 OBJS = sml_server.o
 LIBSML = ../sml/lib/libsml.a
 
@@ -8,7 +8,7 @@ LIBS = -luuid
 endif
 
 sml_server : $(OBJS) $(LIBSML)
-	$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(LIBSML) -o sml_server
+	$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(LIBSML) -o sml_server $(LIBS)
 
 %.o : %.c
 	$(CC) $(CFLAGS) -c $^ -o $@

sml/Makefile

@@ -1,8 +1,8 @@
 UNAME := $(shell uname)
-CFLAGS += -I./include/ -fPIC -fno-stack-protector -g -Wall
+CFLAGS += -I./include/ -fPIC -fno-stack-protector -g -std=c99 -Wall -Wextra -pedantic
 
 # Available Flags:
-# _NO_UUID_LIB - compile without uuid lib
+# SML_NO_UUID_LIB - compile without uuid lib
 
 ifeq ($(UNAME), Linux)
 LIBS=-luuid

sml/include/sml/sml_attention_response.h

@@ -16,9 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-
-#ifndef _SML_ATTENTION_RESPONSE_H_
-#define	_SML_ATTENTION_RESPONSE_H_
+#ifndef SML_ATTENTION_RESPONSE_H_
+#define	SML_ATTENTION_RESPONSE_H_
 
 #include "sml_shared.h"
 #include "sml_octet_string.h"
@@ -46,5 +45,5 @@ void sml_attention_response_free(sml_attention_response *msg);
 #endif
 
 
-#endif /* _SML_ATTENTION_RESPONSE_H_ */
+#endif /* SML_ATTENTION_RESPONSE_H_ */
 

sml/include/sml/sml_boolean.h

@@ -16,8 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef _SML_BOOLEAN_H_
-#define	_SML_BOOLEAN_H_
+#ifndef SML_BOOLEAN_H_
+#define	SML_BOOLEAN_H_
 
 #define SML_BOOLEAN_TRUE 0xFF
 #define SML_BOOLEAN_FALSE 0x00
@@ -40,5 +40,5 @@ void sml_boolean_free(sml_boolean *b);
 #endif
 
 
-#endif /* _SML_BOOLEAN_H_ */
+#endif /* SML_BOOLEAN_H_ */
 

sml/include/sml/sml_close_request.h

@@ -16,8 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef _SML_CLOSE_REQUEST_H_
-#define _SML_CLOSE_REQUEST_H_
+#ifndef SML_CLOSE_REQUEST_H_
+#define SML_CLOSE_REQUEST_H_
 
 #include "sml_shared.h"
 #include "sml_octet_string.h"
@@ -40,5 +40,5 @@ void sml_close_request_free(sml_close_request *msg);
 #endif
 
 
-#endif /* _SML_CLOSE_REQUEST_H_ */
+#endif /* SML_CLOSE_REQUEST_H_ */
 

sml/include/sml/sml_close_response.h

@@ -16,9 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-
-#ifndef _SML_CLOSE_RESPONSE_H_
-#define _SML_CLOSE_RESPONSE_H_
+#ifndef SML_CLOSE_RESPONSE_H_
+#define SML_CLOSE_RESPONSE_H_
 
 #include "sml_close_request.h"
 
@@ -38,5 +37,5 @@ void sml_close_response_free(sml_close_response *msg);
 #endif
 
 
-#endif /* _SML_CLOSE_RESPONSE_H_ */
+#endif /* SML_CLOSE_RESPONSE_H_ */
 

sml/include/sml/sml_crc16.h

@@ -16,8 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef _SML_CRC16_H_
-#define _SML_CRC16_H_
+#ifndef SML_CRC16_H_
+#define SML_CRC16_H_
 
 #include "sml_shared.h"
 
@@ -33,5 +33,5 @@ u16 sml_crc16_calculate(unsigned char *cp, int len) ;
 #endif
 
 
-#endif /* _SML_CRC16_H_ */
+#endif /* SML_CRC16_H_ */
 

sml/include/sml/sml_file.h

@@ -16,8 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef _SML_FILE_H_
-#define	_SML_FILE_H_
+#ifndef SML_FILE_H_
+#define	SML_FILE_H_
 
 #include "sml_message.h"
 #include "sml_shared.h"
@@ -47,5 +47,5 @@ void sml_file_print(sml_file *file);
 #endif
 
 
-#endif /* _SML_FILE_H_ */
+#endif /* SML_FILE_H_ */
 

sml/include/sml/sml_get_list_request.h

@@ -16,8 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef _SML_GET_LIST_REQUEST_H_
-#define _SML_GET_LIST_REQUEST_H_
+#ifndef SML_GET_LIST_REQUEST_H_
+#define SML_GET_LIST_REQUEST_H_
 
 #include "sml_shared.h"
 #include "sml_octet_string.h"
@@ -46,5 +46,5 @@ void sml_get_list_request_free(sml_get_list_request *msg);
 #endif
 
 
-#endif /* _SML_GET_LIST_REQUEST_H_ */
+#endif /* SML_GET_LIST_REQUEST_H_ */
 

sml/include/sml/sml_get_list_response.h

@@ -16,8 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef _SML_GET_LIST_RESPONSE_H_
-#define _SML_GET_LIST_RESPONSE_H_
+#ifndef SML_GET_LIST_RESPONSE_H_
+#define SML_GET_LIST_RESPONSE_H_
 
 #include "sml_shared.h"
 #include "sml_octet_string.h"
@@ -48,5 +48,5 @@ void sml_get_list_response_free(sml_get_list_response *msg);
 #endif
 
 
-#endif /* _SML_GET_LIST_RESPONSE_H_ */
+#endif /* SML_GET_LIST_RESPONSE_H_ */
 

sml/include/sml/sml_get_proc_parameter_request.h

@@ -16,8 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef _SML_GET_PROC_PARAMETER_REQUEST_H_
-#define _SML_GET_PROC_PARAMETER_REQUEST_H_
+#ifndef SML_GET_PROC_PARAMETER_REQUEST_H_
+#define SML_GET_PROC_PARAMETER_REQUEST_H_
 
 #include "sml_shared.h"
 #include "sml_octet_string.h"
@@ -45,5 +45,5 @@ void sml_get_proc_parameter_request_free(sml_get_proc_parameter_request *msg);
 #endif
 
 
-#endif /* _SML_GET_PROC_PARAMETER_REQUEST_H_ */
+#endif /* SML_GET_PROC_PARAMETER_REQUEST_H_ */
 

sml/include/sml/sml_get_proc_parameter_response.h

@@ -16,8 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef _SML_GET_PROC_PARAMETER_RESPONSE_H_
-#define _SML_GET_PROC_PARAMETER_RESPONSE_H_
+#ifndef SML_GET_PROC_PARAMETER_RESPONSE_H_
+#define SML_GET_PROC_PARAMETER_RESPONSE_H_
 
 #include "sml_shared.h"
 #include "sml_octet_string.h"
@@ -43,5 +43,5 @@ void sml_get_proc_parameter_response_free(sml_get_proc_parameter_response *msg);
 #endif
 
 
-#endif /* _SML_GET_PROC_PARAMETER_RESPONSE_H_ */
+#endif /* SML_GET_PROC_PARAMETER_RESPONSE_H_ */
 

sml/include/sml/sml_get_profile_list_request.h

@@ -16,8 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef _SML_GET_PROFILE_LIST_REQUEST_H_
-#define _SML_GET_PROFILE_LIST_REQUEST_H_
+#ifndef SML_GET_PROFILE_LIST_REQUEST_H_
+#define SML_GET_PROFILE_LIST_REQUEST_H_
 
 #include "sml_get_profile_pack_request.h"
 
@@ -38,5 +38,5 @@ typedef sml_get_profile_pack_request sml_get_profile_list_request;
 #endif
 
 
-#endif /* _SML_GET_PROFILE_LIST_REQUEST_H_ */
+#endif /* SML_GET_PROFILE_LIST_REQUEST_H_ */
 

sml/include/sml/sml_get_profile_list_response.h

@@ -16,8 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef _SML_GET_PROFILE_LIST_RESPONSE_H_
-#define _SML_GET_PROFILE_LIST_RESPONSE_H_
+#ifndef SML_GET_PROFILE_LIST_RESPONSE_H_
+#define SML_GET_PROFILE_LIST_RESPONSE_H_
 
 #include "sml_shared.h"
 #include "sml_octet_string.h"
@@ -51,5 +51,5 @@ void sml_get_profile_list_response_free(sml_get_profile_list_response *msg);
 #endif
 
 
-#endif /* _SML_GET_PROFILE_LIST_RESPONSE_H_ */
+#endif /* SML_GET_PROFILE_LIST_RESPONSE_H_ */
 

sml/include/sml/sml_get_profile_pack_request.h

@@ -16,8 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef _SML_GET_PROFILE_PACK_REQUEST_H_
-#define _SML_GET_PROFILE_PACK_REQUEST_H_
+#ifndef SML_GET_PROFILE_PACK_REQUEST_H_
+#define SML_GET_PROFILE_PACK_REQUEST_H_
 
 #include "sml_shared.h"
 #include "sml_octet_string.h"
@@ -64,5 +64,5 @@ void sml_get_profile_pack_request_free(sml_get_profile_pack_request *msg);
 #endif
 
 
-#endif /* _SML_GET_PROFILE_PACK_REQUEST_H_ */
+#endif /* SML_GET_PROFILE_PACK_REQUEST_H_ */
 

sml/include/sml/sml_get_profile_pack_response.h

@@ -16,8 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef _SML_GET_PROFILE_PACK_RESPONSE_H_
-#define _SML_GET_PROFILE_PACK_RESPONSE_H_
+#ifndef SML_GET_PROFILE_PACK_RESPONSE_H_
+#define SML_GET_PROFILE_PACK_RESPONSE_H_
 
 #include "sml_shared.h"
 #include "sml_octet_string.h"
@@ -84,5 +84,5 @@ void sml_value_entry_free(sml_value_entry *entry);
 #endif
 
 
-#endif /* _SML_GET_PROFILE_PACK_RESPONSE_H_ */
+#endif /* SML_GET_PROFILE_PACK_RESPONSE_H_ */
 

sml/include/sml/sml_list.h

@@ -16,9 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-
-#ifndef _SML_LIST_H_
-#define	_SML_LIST_H_
+#ifndef SML_LIST_H_
+#define	SML_LIST_H_
 
 #include "sml_time.h"
 #include "sml_octet_string.h"
@@ -66,5 +65,5 @@ void sml_list_free(sml_list *list);
 #endif
 
 
-#endif /* _SML_LIST_H_ */
+#endif /* SML_LIST_H_ */
 

sml/include/sml/sml_message.h

@@ -16,9 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-
-#ifndef _SML_MESSAGE_H_
-#define	_SML_MESSAGE_H_
+#ifndef SML_MESSAGE_H_
+#define	SML_MESSAGE_H_
 
 #include <stdlib.h>
 #include "sml_octet_string.h"
@@ -92,5 +91,5 @@ void sml_message_body_write(sml_message_body *message_body, sml_buffer *buf);
 #endif
 
 
-#endif /* _SML_MESSAGE_H_ */
+#endif /* SML_MESSAGE_H_ */
 

sml/include/sml/sml_number.h

@@ -16,9 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-
-#ifndef _SML_NUMBER_H_
-#define	_SML_NUMBER_H_
+#ifndef SML_NUMBER_H_
+#define	SML_NUMBER_H_
 
 #include "sml_shared.h"
 
@@ -64,6 +63,15 @@ void sml_number_free(void *np);
 #define sml_i32_write(n, buf) sml_number_write(n, SML_TYPE_INTEGER, SML_TYPE_NUMBER_32, buf)
 #define sml_i64_write(n, buf) sml_number_write(n, SML_TYPE_INTEGER, SML_TYPE_NUMBER_64, buf)
 
+#define sml_u8_free( n ) sml_number_free( n )
+#define sml_u16_free( n ) sml_number_free( n )
+#define sml_u32_free( n ) sml_number_free( n )
+#define sml_u64_free( n ) sml_number_free( n )
+#define sml_i8_free( n ) sml_number_free( n )
+#define sml_i16_free( n ) sml_number_free( n )
+#define sml_i32_free( n ) sml_number_free( n )
+#define sml_i64_free( n ) sml_number_free( n )
+
 typedef u8 sml_unit;
 #define sml_unit_init(n) sml_u8_init(n)
 #define sml_unit_parse(buf) sml_u8_parse(buf)
@@ -75,5 +83,5 @@ typedef u8 sml_unit;
 #endif
 
 
-#endif /* _SML_NUMBER_H_ */
+#endif /* SML_NUMBER_H_ */
 

sml/include/sml/sml_octet_string.h

@@ -16,8 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with libSML.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef _SML_OCTET_STRING_H_
-#define	_SML_OCTET_STRING_H_
+#ifndef SML_OCTET_STRING_H_
+#define	SML_OCTET_STRING_H_
 
 #include <string.h>
 #include "sml_shared.h"
@@ -52,5 +52,5 @@ typedef octet_string sml_signature;
 #endif
 
 
-#endif /* _SML_OCTET_STRING_H_ */
+#endif /* SML_OCTET_STRING_H_ */