--- libaitmqtt/inc/aitmqtt.h 2012/06/20 15:02:23 1.2 +++ libaitmqtt/inc/aitmqtt.h 2013/05/30 09:18:33 1.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitmqtt.h,v 1.2 2012/06/20 15:02:23 misho Exp $ +* $Id: aitmqtt.h,v 1.3 2013/05/30 09:18:33 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -196,9 +196,9 @@ typedef struct { // ------------------------------------------------------- // mqtt_GetErrno() Get error code of last operation -inline int mqtt_GetErrno(); +int mqtt_GetErrno(); // mqtt_GetError() Get error text of last operation -inline const char *mqtt_GetError(); +const char *mqtt_GetError(); // ------------------------------------------------------- @@ -208,7 +208,7 @@ inline const char *mqtt_GetError(); * @len = >0 Allocate buffer with length * return: NULL error or Message, after use must call mqtt_msgFree() with all!=0 */ -inline mqtt_msg_t *mqtt_msgAlloc(unsigned short len); +mqtt_msg_t *mqtt_msgAlloc(unsigned short len); /* * mqtt_msgFree() Free MQTT message * @@ -216,7 +216,7 @@ inline mqtt_msg_t *mqtt_msgAlloc(unsigned short len); * @all = !=0 Destroy entire message, if MQTT Message allocated with mqtt_msgAlloc() * return: none */ -inline void mqtt_msgFree(mqtt_msg_t ** __restrict msg, int all); +void mqtt_msgFree(mqtt_msg_t ** __restrict msg, int all); /* * mqtt_msgRealloc() Reallocate MQTT message buffer * @@ -224,14 +224,14 @@ inline void mqtt_msgFree(mqtt_msg_t ** __restrict msg, * @len = new length * return: -1 error or >-1 old buffer length */ -inline int mqtt_msgRealloc(mqtt_msg_t * __restrict msg, unsigned short len); +int mqtt_msgRealloc(mqtt_msg_t * __restrict msg, unsigned short len); /* * mqtt_msgDup() - Duplicate message buffer * * @msg = Message * return: NULL error or !=NULL duplicated message, after use must call mqtt_msgFree() with all!=0 */ -inline mqtt_msg_t *mqtt_msgDup(mqtt_msg_t * __restrict msg); +mqtt_msg_t *mqtt_msgDup(mqtt_msg_t * __restrict msg); /* * mqtt_expandTopic() - Expanding topic to regular expression @@ -261,7 +261,7 @@ int mqtt_sqlTopic(const char *csInput, char * __restri * @num = number for encode * return: -1 error or >-1 length */ -inline unsigned int mqtt_encodeLen(unsigned int num); +unsigned int mqtt_encodeLen(unsigned int num); /* * mqtt_decodeLen() Decode length from MQTT packet * @@ -269,21 +269,21 @@ inline unsigned int mqtt_encodeLen(unsigned int num); * @n = sizeof bytes, if !=NULL * return: -1 error, >-1 length of message */ -inline unsigned int mqtt_decodeLen(void * __restrict len, int * __restrict n); +unsigned int mqtt_decodeLen(void * __restrict len, int * __restrict n); /* * mqtt_sizeLen Return sizeof len field * * @len = length * return: -1 error, >-1 sizeof len in bytes */ -inline char mqtt_sizeLen(unsigned int len); +char mqtt_sizeLen(unsigned int len); /* * mqtt_pktLen() - Get total packet length * * @hdr = MQTT packet header * return: packet length */ -inline unsigned int mqtt_pktLen(struct mqtthdr * __restrict hdr); +unsigned int mqtt_pktLen(struct mqtthdr * __restrict hdr); /* * mqtt_str2subs Create MQTT subscribe variable from string(s) * @@ -293,7 +293,7 @@ inline unsigned int mqtt_pktLen(struct mqtthdr * __res * count of elements must be equal with csStr elements * return: NULL error or != subscribe variables array, must be free after use with mqtt_freeSub() */ -inline mqtt_subscr_t *mqtt_str2subs(const char **csStr, unsigned short strnum, +mqtt_subscr_t *mqtt_str2subs(const char **csStr, unsigned short strnum, unsigned char *qoses); /* * mqtt_subFree() Free array from subscribe variables @@ -301,14 +301,14 @@ inline mqtt_subscr_t *mqtt_str2subs(const char **csStr * @subs = Subscribe variables * return: none */ -inline void mqtt_subFree(mqtt_subscr_t ** __restrict subs); +void mqtt_subFree(mqtt_subscr_t ** __restrict subs); /* * mqtt_subAlloc() Create array from subscribe variables * * @num = Number of elements * return: NULL error or subscribe array, after use must call mqtt_subFree() */ -inline mqtt_subscr_t *mqtt_subAlloc(unsigned short num); +mqtt_subscr_t *mqtt_subAlloc(unsigned short num); /* * mqtt_subRealloc() Reallocate array from subscribe variables * @@ -316,7 +316,7 @@ inline mqtt_subscr_t *mqtt_subAlloc(unsigned short num * @num = Number of elements * return: NULL error or subscribe array, after use must call mqtt_subFree() */ -inline mqtt_subscr_t *mqtt_subRealloc(mqtt_subscr_t ** __restrict subs, unsigned short num); +mqtt_subscr_t *mqtt_subRealloc(mqtt_subscr_t ** __restrict subs, unsigned short num); /* * mqtt_subCopy() - Copy subscription structure to another one * @@ -324,7 +324,7 @@ inline mqtt_subscr_t *mqtt_subRealloc(mqtt_subscr_t ** * @src = source subscription * return: =NULL error or !=NULL successful copied a structure */ -inline mqtt_subscr_t *mqtt_subCopy(mqtt_subscr_t * __restrict dst, mqtt_subscr_t * __restrict src); +mqtt_subscr_t *mqtt_subCopy(mqtt_subscr_t * __restrict dst, mqtt_subscr_t * __restrict src); /*** SENDER FUNCTIONS ***/ @@ -401,7 +401,7 @@ int mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const * @msgID = MessageID * return: -1 error or >-1 message size for send */ -inline int mqtt_msgPUBACK(mqtt_msg_t * __restrict buf, unsigned short msgID); +int mqtt_msgPUBACK(mqtt_msg_t * __restrict buf, unsigned short msgID); /* * mqtt_msgPUBREC() Create PUBREC message * @@ -409,7 +409,7 @@ inline int mqtt_msgPUBACK(mqtt_msg_t * __restrict buf, * @msgID = MessageID * return: -1 error or >-1 message size for send */ -inline int mqtt_msgPUBREC(mqtt_msg_t * __restrict buf, unsigned short msgID); +int mqtt_msgPUBREC(mqtt_msg_t * __restrict buf, unsigned short msgID); /* * mqtt_msgPUBREL() Create PUBREL message * @@ -417,7 +417,7 @@ inline int mqtt_msgPUBREC(mqtt_msg_t * __restrict buf, * @msgID = MessageID * return: -1 error or >-1 message size for send */ -inline int mqtt_msgPUBREL(mqtt_msg_t * __restrict buf, unsigned short msgID); +int mqtt_msgPUBREL(mqtt_msg_t * __restrict buf, unsigned short msgID); /* * mqtt_msgPUBCOMP() Create PUBCOMP message * @@ -425,7 +425,7 @@ inline int mqtt_msgPUBREL(mqtt_msg_t * __restrict buf, * @msgID = MessageID * return: -1 error or >-1 message size for send */ -inline int mqtt_msgPUBCOMP(mqtt_msg_t * __restrict buf, unsigned short msgID); +int mqtt_msgPUBCOMP(mqtt_msg_t * __restrict buf, unsigned short msgID); /* * mqtt_msgSUBSCRIBE() Create SUBSCRIBE message