Hello,
I made the formatting a little more consistent int the Ecore_Ipc.h.
Also,
for the STRUCT_ENC function, if the structure to encode is NULL we
should set the size to 0 and return NULL, So I made a change to
accommodate this.
Stafford
Index: Ecore_Ipc.h
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_ipc/Ecore_Ipc.h,v
retrieving revision 1.7
diff -u -r1.7 Ecore_Ipc.h
--- Ecore_Ipc.h 9 Apr 2005 00:07:32 -0000 1.7
+++ Ecore_Ipc.h 20 Apr 2005 15:43:43 -0000
@@ -58,46 +58,46 @@
/* 1, 2, 4 and 8 byte datatypes */
/* unpacking */
#define ECORE_IPC_GET64(v)\
- { \
- p->v = ECORE_IPC_SWAP2CPU64(*(long long *)(ptr)); \
- ptr += 8; \
- }
+ { \
+ p->v = ECORE_IPC_SWAP2CPU64(*(long long *)(ptr)); \
+ ptr += 8; \
+ }
#define ECORE_IPC_GET32(v)\
- { \
- p->v = ECORE_IPC_SWAP2CPU32(*(int *)(ptr)); \
- ptr += 4; \
- }
+ { \
+ p->v = ECORE_IPC_SWAP2CPU32(*(int *)(ptr)); \
+ ptr += 4; \
+ }
#define ECORE_IPC_GET16(v)\
- { \
- p->v = ECORE_IPC_SWAP2CPU16(*(short *)(ptr)); \
- ptr += 2; \
- }
+ { \
+ p->v = ECORE_IPC_SWAP2CPU16(*(short *)(ptr)); \
+ ptr += 2; \
+ }
#define ECORE_IPC_GET8(v) \
- { \
- p->v = ECORE_IPC_SWAP2CPU8(*(char *)(ptr)); \
- ptr += 1; \
- }
+ { \
+ p->v = ECORE_IPC_SWAP2CPU8(*(char *)(ptr)); \
+ ptr += 1; \
+ }
/* packing */
#define ECORE_IPC_PUT64(v)\
- { \
- *(long long *)(ptr) = ECORE_IPC_SWAP2NET64(p->v); \
- ptr += 8; \
- }
+ { \
+ *(long long *)(ptr) = ECORE_IPC_SWAP2NET64(p->v); \
+ ptr += 8; \
+ }
#define ECORE_IPC_PUT32(v)\
- { \
- *(int *)(ptr) = ECORE_IPC_SWAP2NET32(p->v); \
- ptr += 4; \
- }
+ { \
+ *(int *)(ptr) = ECORE_IPC_SWAP2NET32(p->v); \
+ ptr += 4; \
+ }
#define ECORE_IPC_PUT16(v)\
- { \
- *(short *)(ptr) = ECORE_IPC_SWAP2NET16(p->v); \
- ptr += 2; \
- }
+ { \
+ *(short *)(ptr) = ECORE_IPC_SWAP2NET16(p->v); \
+ ptr += 2; \
+ }
#define ECORE_IPC_PUT8(v) \
- { \
- *(char *)(ptr) = ECORE_IPC_SWAP2NET8(p->v); \
- ptr += 1; \
- }
+ { \
+ *(char *)(ptr) = ECORE_IPC_SWAP2NET8(p->v); \
+ ptr += 1; \
+ }
/* padding data */
#define ECORE_IPC_PAD8() ptr += 1
#define ECORE_IPC_PAD16() ptr += 2
@@ -113,18 +113,18 @@
/* strings */
#define ECORE_IPC_CHEKS() if (*((unsigned char *)d + s - 1) != 0) return 0;
#define ECORE_IPC_GETS(v) \
- { \
- if (ptr < ((unsigned char *)d + s)) \
- { \
- p->v = ptr; \
- ptr += strlen(p->v) + 1; \
- } \
- }
+ { \
+ if (ptr < ((unsigned char *)d + s)) \
+ { \
+ p->v = ptr; \
+ ptr += strlen(p->v) + 1; \
+ } \
+ }
#define ECORE_IPC_PUTS(v, l)\
- { \
- strcpy(ptr, p->v); \
- ptr += l + 1; \
- }
+ { \
+ strcpy(ptr, p->v); \
+ ptr += l + 1; \
+ }
/* handy to calculate what sized block we need to alloc */
#define ECORE_IPC_SLEN(l, v) ((l = strlen(p->v)) + 1)
@@ -136,36 +136,36 @@
#define ECORE_IPC_DEC_EVAS_LIST_PROTO(x) static Evas_List *x(void *d, int s)
#define ECORE_IPC_ENC_EVAS_LIST_PROTO(x) static void *x(Evas_List *lp, int *s)
+
/* decoder setup - saves typing. requires data packet of exact size, or fail */
#define ECORE_IPC_DEC_STRUCT_HEAD_EXACT(typ, x) \
- typ *p; \
- unsigned char *ptr; \
- p = (typ *)pp; \
- if (!d) return 0; \
- if (s != (x)) return 0; \
- ptr = d;
+ typ *p; \
+ unsigned char *ptr; \
+ p = (typ *)pp; \
+ if (!d) return 0; if (s != (x)) return 0; \
+ ptr = d;
/* decoder setup - saves typing. requires data packet of a minimum size */
#define ECORE_IPC_DEC_STRUCT_HEAD_MIN(typ, x) \
- typ *p; \
- unsigned char *ptr; \
- p = (typ *)pp; \
- if (!d) return 0; \
- if (s < (x)) return 0; \
- ptr = d;
+ typ *p; \
+ unsigned char *ptr; \
+ p = (typ *)pp; \
+ if (!d) return 0; if (s < (x)) return 0; \
+ ptr = d;
/* footer for the hell of it */
#define ECORE_IPC_DEC_STRUCT_FOOT() return 1
/* header for encoder - gives native strct type and size of flattened packet */
#define ECORE_IPC_ENC_STRUCT_HEAD(typ, sz) \
- typ *p; \
- unsigned char *d, *ptr; \
- int len; \
- p = (typ *)pp; \
- *s = 0; \
- len = sz; \
- d = malloc(len); \
- if (!d) return NULL; \
- *s = len; \
- ptr = d;
+ typ *p; \
+ unsigned char *d, *ptr; \
+ int len; \
+ *s = 0; \
+ if(!pp) return NULL; \
+ p = (typ *)pp; \
+ len = sz; \
+ d = malloc(len); \
+ if (!d) return NULL; \
+ *s = len; \
+ ptr = d;
/* footer for the hell of it */
#define ECORE_IPC_ENC_STRUCT_FOOT() return d
