From 98170010ee92c807650bd529216612532975c14e Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Wed, 28 May 2014 15:51:47 +1000 Subject: The UUID faking code is common enough to stick it in a macro. --- src/extantz/extantz.c | 2 +- src/libraries/love.h | 1 + src/love/love.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index e611e4d..4f5d9ea 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c @@ -150,7 +150,7 @@ static void _onWorldClick(void *data, Evas *e EINA_UNUSED, Evas_Object *o, void char SID[64]; // CUBE_UUID.events.touch_start(1), but we just make one up for now. - snprintf(SID, sizeof(SID), "%08lx-%04lx-%04lx-%04lx-%012lx", random(), random() % 0xFFFF, random() % 0xFFFF, random() % 0xFFFF, random()); + snprintf(SID, sizeof(SID), FAKE_UUID); sendForth(ourGlobals.server, SID, "events.touch_start(1)"); } } diff --git a/src/libraries/love.h b/src/libraries/love.h index cbd4c80..cf23f3c 100644 --- a/src/libraries/love.h +++ b/src/libraries/love.h @@ -83,6 +83,7 @@ love needs #include "Runnr.h" +#define FAKE_UUID "%08lx-%04lx-%04lx-%04lx-%012lx", random(), random() % 0xFFFF, random() % 0xFFFF, random() % 0xFFFF, random() typedef struct _vec4 { diff --git a/src/love/love.c b/src/love/love.c index dc27d9c..7d50917 100644 --- a/src/love/love.c +++ b/src/love/love.c @@ -146,7 +146,7 @@ static void dirList_compile(const char *name, const char *path, void *data) scriptCount++; gettimeofday(&me->startTime, NULL); - snprintf(me->SID, sizeof(me->SID), "%08lx-%04lx-%04lx-%04lx-%012lx", random(), random() % 0xFFFF, random() % 0xFFFF, random() % 0xFFFF, random()); + snprintf(me->SID, sizeof(me->SID), FAKE_UUID); snprintf(me->fileName, sizeof(me->fileName), "%s/%s", path, name); eina_hash_add(ourGlobals->scripts, me->SID, me); sendForth(ourGlobals->serverLuaSL, me->SID, "compile(%s)", me->fileName); @@ -431,7 +431,7 @@ static Eina_Bool _dataLuaSL(void *data, int type, Ecore_Con_Event_Server_Data *e } } while (temp && (0 < lineNo--)); - sprintf(key, "%08lx-%04lx-%04lx-%04lx-%012lx", random(), random() % 0xFFFF, random() % 0xFFFF, random() % 0xFFFF, random()); + sprintf(key, FAKE_UUID); sendForth(ourGlobals->serverLuaSL, SID, "return \"%s\"", key); // TODO - For now, just send it to everyone. -- cgit v1.1