tools/quote-file.sh tools/compiler.c tools/generate.c

2008-02-22  Mark Doffman  <mark.doffman@codethink.co.uk>

    * tools/quote-file.sh
    * tools/compiler.c
    * tools/generate.c

      Move to using the 'C' struct compiler code.

WARNING: This commit does not compile. It is a partial change.

svn path=/trunk/; revision=135
This commit is contained in:
Mark Doffman 2008-03-10 17:47:29 +00:00 committed by Philip Withnall
parent eb13d2e55b
commit cff3cc7ad9

View File

@ -1117,12 +1117,17 @@ load_metadata (const gchar *filename,
GModule **dlhandle, GModule **dlhandle,
gsize *len) gsize *len)
{ {
guchar *metadata; gpointer metadata;
gsize *metadata_size; gsize *metadata_size;
GModule *handle; GModule *handle;
handle = g_module_open (filename, G_MODULE_BIND_LOCAL|G_MODULE_BIND_LAZY); handle = g_module_open (filename, G_MODULE_BIND_LOCAL|G_MODULE_BIND_LAZY);
if (!g_module_symbol (handle, "_G_METADATA", (gpointer *) &metadata)) if (!handle)
{
g_printerr("Could not load module '%s'\n", filename);
return NULL;
}
if (!g_module_symbol (handle, "_G_METADATA", &metadata))
{ {
g_printerr ("Could not load metadata from '%s': %s\n", g_printerr ("Could not load metadata from '%s': %s\n",
filename, g_module_error ()); filename, g_module_error ());
@ -1141,7 +1146,7 @@ load_metadata (const gchar *filename,
if (dlhandle) if (dlhandle)
*dlhandle = handle; *dlhandle = handle;
return metadata; return *((const guchar **) metadata);
} }
int int
@ -1169,7 +1174,7 @@ main (int argc, char *argv[])
for (i = 0; input[i]; i++) for (i = 0; input[i]; i++)
{ {
GModule *dlhandle = NULL; GModule *dlhandle = NULL;
const guchar *metadata; const guchar *metadata = NULL;
gsize len; gsize len;
if (raw) if (raw)