refactoring - init functions

include/psyc.h

@@ -20,7 +20,8 @@
 #include <string.h>
 #include <sys/types.h>
 
-#define PSYC_EPOCH      1440444041      // 2015-08-24 21:20:41 CET (Monday)
+#define PSYC_VERSION 1
+#define PSYC_EPOCH   1440444041      // 2015-08-24 21:20:41 CET (Monday)
 
 #define	PSYC_C2STR(str) {sizeof(str)-1, str}
 #define	PSYC_C2ARG(str) str, sizeof(str)-1
@@ -118,28 +119,6 @@ typedef struct
 	intptr_t value;
 } PsycDictInt;
 
-/**
- * Shortcut for creating a PsycString.
- *
- * @param str Pointer to the buffer.
- * @param len Length of that buffer.
- *
- * @return An instance of the PsycString struct.
- */
-static inline
-PsycString psyc_string_new (char *str, size_t len)
-{
-	PsycString s = {len, str};
-	return s;
-}
-
-static inline
-unsigned int psyc_version ()
-{
-	return 1;
-}
-
-
 /**
  * Checks if long keyword string inherits from short keyword string.
  */

include/psyc/packet.h

@@ -121,19 +121,17 @@ PsycModifierFlag psyc_modifier_length_check (PsycModifier *m)
 	return flag;
 }
 
-/** Create new modifier */
+/** Initialize modifier */
 static inline
-PsycModifier psyc_modifier_new (char oper,
-                                char *name, size_t namelen,
-                                char *value, size_t valuelen,
-                                PsycModifierFlag flag)
+void psyc_modifier_init (PsycModifier *m, char oper,
+                         char *name, size_t namelen,
+                         char *value, size_t valuelen,
+                         PsycModifierFlag flag)
 {
-	PsycModifier m = {oper, {namelen, name}, {valuelen, value}, flag};
+	*m = (PsycModifier) {oper, {namelen, name}, {valuelen, value}, flag};
 
 	if (flag == PSYC_MODIFIER_CHECK_LENGTH) // find out if it needs a length
-		m.flag = psyc_modifier_length_check(&m);
-
-	return m;
+		m->flag = psyc_modifier_length_check(m);
 }
 
 /**
@@ -165,20 +163,23 @@ PsycPacketFlag psyc_packet_length_check (PsycPacket *p);
  */
 size_t psyc_packet_length_set (PsycPacket *p);
 
-/** Create new list. */
-PsycList psyc_list_new (PsycString *elems, size_t num_elems, PsycListFlag flag);
+/** Initialize list. */
+void psyc_list_init (PsycList *list, PsycString *elems, size_t num_elems,
+                     PsycListFlag flag);
 
-/** Create new packet. */
-PsycPacket psyc_packet_new (PsycModifier *routing, size_t routinglen,
-                            PsycModifier *entity, size_t entitylen,
-                            char *method, size_t methodlen,
-                            char *data, size_t datalen,
-                            PsycPacketFlag flag);
+/** Initialize packet. */
+void psyc_packet_init (PsycPacket *packet,
+                       PsycModifier *routing, size_t routinglen,
+                       PsycModifier *entity, size_t entitylen,
+                       char *method, size_t methodlen,
+                       char *data, size_t datalen,
+                       PsycPacketFlag flag);
 
-/** Create new packet with raw content. */
-PsycPacket psyc_packet_new_raw (PsycModifier *routing, size_t routinglen,
-                                char *content, size_t contentlen,
-                                PsycPacketFlag flag);
+/** Initialize packet with raw content. */
+void psyc_packet_init_raw (PsycPacket *packet,
+                           PsycModifier *routing, size_t routinglen,
+                           char *content, size_t contentlen,
+                           PsycPacketFlag flag);
 
 /** @} */ // end of packet group
 

include/psyc/render.h

@@ -52,9 +52,9 @@ typedef enum
  * This function renders packet->length bytes to the buffer,
  * if buflen is less than that an error is returned.
  *
- * @see psyc_packet_new
- * @see psyc_packet_new_raw
- * @see psyc_packet_length_set
+ * @see psyc_packet_init()
+ * @see psyc_packet_init_raw()
+ * @see psyc_packet_length_set()
  */
 #ifdef __INLINE_PSYC_RENDER
 static inline