Author: stephan
Date: 2007-10-28 09:36:02 +0000 (Sun, 28 Oct 2007)
New Revision: 26204
Removed:
squeeze/trunk/INSTALL
squeeze/trunk/depcomp
squeeze/trunk/install-sh
squeeze/trunk/missing
Modified:
squeeze/trunk/libsqueeze/Makefile.am
squeeze/trunk/libsqueeze/parser-context.c
squeeze/trunk/libsqueeze/parser-context.h
squeeze/trunk/libsqueeze/parser.c
squeeze/trunk/libsqueeze/scanf-parser.c
Log:
Remove some files from svn
Add parser-code to Makefile.am
Make libsqueeze compile
Deleted: squeeze/trunk/INSTALL
Deleted: squeeze/trunk/depcomp
Deleted: squeeze/trunk/install-sh
Modified: squeeze/trunk/libsqueeze/Makefile.am
===================================================================
--- squeeze/trunk/libsqueeze/Makefile.am 2007-10-27 22:26:43 UTC (rev
26203)
+++ squeeze/trunk/libsqueeze/Makefile.am 2007-10-28 09:36:02 UTC (rev
26204)
@@ -1,16 +1,11 @@
lib_LTLIBRARIES = libsqueeze-1.la
libsqueeze_1_la_SOURCES = \
- internals.c internals.h \
libsqueeze.c libsqueeze.h \
- slist.c slist.h \
- support-template.c support-template.h \
- archive.c archive.h \
- archive-iter.c archive-iter.h \
- archive-iter-pool.c archive-iter-pool.h \
- archive-tempfs.c archive-tempfs.h \
- support-factory.c support-factory.h \
- support-reader.c support-reader.h
+ parser-context.c parser-context.h \
+ parser.c parser.h \
+ scanf-parser.c scanf-parser.h \
+ archive.c archive.h
# archive-command.c archive-command.h
# spawn-command.c spawn-command.h
Modified: squeeze/trunk/libsqueeze/parser-context.c
===================================================================
--- squeeze/trunk/libsqueeze/parser-context.c 2007-10-27 22:26:43 UTC (rev
26203)
+++ squeeze/trunk/libsqueeze/parser-context.c 2007-10-28 09:36:02 UTC (rev
26204)
@@ -19,8 +19,10 @@
#include <glib-object.h>
#include <signal.h>
+#include <thunar-vfs/thunar-vfs.h>
#include "libsqueeze.h"
+#include "archive.h"
#include "parser-context.h"
enum {
@@ -33,13 +35,13 @@
G_DEFINE_TYPE(LSQParserContext, lsq_parser_context, G_TYPE_OBJECT);
static void
-lsq_parser_context_init(LSQParser *self)
+lsq_parser_context_init(LSQParserContext *self)
{
self->archive = NULL;
}
static void
-lsq_parser_context_class_init(LSQParserClass *klass)
+lsq_parser_context_class_init(LSQParserContextClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS(klass);
GParamSpec *pspec;
@@ -48,7 +50,7 @@
object_class->get_property = lsq_parser_context_get_property;
pspec = g_param_spec_object("archive", NULL, NULL, LSQ_TYPE_ARCHIVE,
G_PARAM_READABLE|G_PARAM_CONSTRUCT_ONLY);
- g_object_class_install_property(object_clas,
LSQ_PARSER_CONTEXT_PROPERTY_ARCHIVE, pspec);
+ g_object_class_install_property(object_class,
LSQ_PARSER_CONTEXT_PROPERTY_ARCHIVE, pspec);
}
static void
@@ -76,7 +78,7 @@
LSQParserContext*
lsq_parser_context_new(LSQArchive *archive)
{
- LSQParserContext *ctx
+ LSQParserContext *ctx;
g_return_val_if_fail(LSQ_IS_ARCHIVE(archive), NULL);
@@ -90,5 +92,5 @@
{
GIOStatus stat;
- stat = g_io_channel_read_line
+ /*stat = g_io_channel_read_line;*/
}
Modified: squeeze/trunk/libsqueeze/parser-context.h
===================================================================
--- squeeze/trunk/libsqueeze/parser-context.h 2007-10-27 22:26:43 UTC (rev
26203)
+++ squeeze/trunk/libsqueeze/parser-context.h 2007-10-28 09:36:02 UTC (rev
26204)
@@ -18,25 +18,25 @@
G_BEGIN_DECLS
-#define LSQ_TYPE_PARSER_CONTEXT lsq_parser_context_get_type()
+#define LSQ_PARSER_CONTEXT_TYPE lsq_parser_context_get_type()
#define LSQ_PARSER_CONTEXT(obj) ( \
G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- LSQ_TYPE_PARSER_CONTEXT, \
+ LSQ_PARSER_CONTEXT_TYPE, \
LSQParserContext))
#define LSQ_IS_PARSER_CONTEXT(obj) ( \
G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
- LSQ_TYPE_PARSER_CONTEXT))
+ LSQ_PARSER_CONTEXT_TYPE))
#define LSQ_PARSER_CONTEXT_CLASS(class) ( \
G_TYPE_CHECK_CLASS_CAST ((class), \
- LSQ_TYPE_PARSER_CONTEXT, \
+ LSQ_PARSER_CONTEXT_TYPE, \
LSQParserContextClass))
#define LSQ_IS_PARSER_CONTEXT_CLASS(class) ( \
G_TYPE_CHECK_CLASS_TYPE ((class), \
- LSQ_TYPE_PARSER_CONTEXT))
+ LSQ_PARSER_CONTEXT_TYPE))
typedef struct _LSQParserContext LSQParserContext;
Modified: squeeze/trunk/libsqueeze/parser.c
===================================================================
--- squeeze/trunk/libsqueeze/parser.c 2007-10-27 22:26:43 UTC (rev 26203)
+++ squeeze/trunk/libsqueeze/parser.c 2007-10-28 09:36:02 UTC (rev 26204)
@@ -19,6 +19,7 @@
#include <glib-object.h>
#include <signal.h>
+#include <thunar-vfs/thunar-vfs.h>
#include "libsqueeze.h"
#include "parser-context.h"
Modified: squeeze/trunk/libsqueeze/scanf-parser.c
===================================================================
--- squeeze/trunk/libsqueeze/scanf-parser.c 2007-10-27 22:26:43 UTC (rev
26203)
+++ squeeze/trunk/libsqueeze/scanf-parser.c 2007-10-28 09:36:02 UTC (rev
26204)
@@ -20,19 +20,20 @@
#include <glib/gstdio.h>
#include <glib-object.h>
-#include "libsqueeze-archive.h"
+#include <thunar-vfs/thunar-vfs.h>
+#include "libsqueeze.h"
#include "archive-iter.h"
#include "scanf-parser.h"
#include "archive.h"
typedef struct _parse_part parse_part;
-typedef guint (*)(gchar*, guint, parse_part*) parse_func;
+typedef guint (*LSQParseFunc)(gchar*, guint, parse_part*);
struct _parse_part
{
gchar *delimiter;
- parse_func function;
+ LSQParseFunc function;
guint index;
guint width;
//gtype
@@ -73,26 +74,26 @@
guint skip_char(gchar *str, guint lng, parse_part *part)
{
- const gchar ptr;
+ const gchar *ptr;
if(!lng)
return 0;
- if(!part->delim[0])
+ if(!part->delimiter[0])
return 1;
//for(ptr = str; g_ascii_isspace(*ptr); ptr++);
- ptr = g_strstr_len(str, lng, part->delim);
+ ptr = g_strstr_len(str, lng, part->delimiter);
return ptr - str;
}
guint skip_decimal(gchar *str, guint lng, parse_part *part)
{
- gchar ptr;
+ gchar *ptr;
#ifdef DO_EXSTENSIVE_CHECKING
- gchar ptr2;
+ gchar *ptr2;
#endif
if(!lng)
@@ -118,9 +119,9 @@
guint skip_floatingpoint(gchar *str, guint lng, parse_part *part)
{
- gchar ptr;
+ gchar *ptr;
#ifdef DO_EXSTENSIVE_CHECKING
- gchar ptr2;
+ gchar *ptr2;
#endif
if(!lng)
@@ -146,9 +147,9 @@
guint skip_octal(gchar *str, guint lng, parse_part *part)
{
- gchar ptr;
+ gchar *ptr;
#ifdef DO_EXSTENSIVE_CHECKING
- gchar ptr2;
+ gchar *ptr2;
#endif
if(!lng)
@@ -174,7 +175,7 @@
guint skip_string(gchar *str, guint lng, parse_part *part)
{
- gchar ptr;
+ gchar *ptr;
if(!lng)
return 0;
@@ -191,9 +192,9 @@
guint skip_unsigned(gchar *str, guint lng, parse_part *part)
{
- gchar ptr;
+ gchar *ptr;
#ifdef DO_EXSTENSIVE_CHECKING
- gchar ptr2;
+ gchar *ptr2;
#endif
if(!lng)
@@ -217,9 +218,9 @@
guint skip_hexadecimal(gchar *str, guint lng, parse_part *part)
{
- gchar ptr;
+ gchar *ptr;
#ifdef DO_EXSTENSIVE_CHECKING
- gchar ptr2;
+ gchar *ptr2;
#endif
if(!lng)
@@ -248,7 +249,7 @@
if(lng < 1)
return 0;
- *part->
+ /*part->*/
return 1;
}
@@ -309,7 +310,7 @@
size++;
}
- new_str = g_new(gchar, size+1)
+ new_str = g_new(gchar, size+1);
new_str[size] = '\0';
size = 0;
@@ -401,6 +402,7 @@
gboolean skip_flag;
guint width_flag;
guint index_flag;
+ guint index;
parse_part *part = g_new0(parse_part, 1);
GSList *parts = g_slist_prepend(NULL, part);
@@ -457,7 +459,7 @@
if(g_ascii_isdigit(ch))
{
width_flag = strtoul(ptr-1, &ptr, 10);
- cp = *ptr;
+ ch = *ptr;
}
/*}}}*/
@@ -516,15 +518,18 @@
lsq_archive_set_property_type(archive, index, G_TYPE_UINT);
break;
case SIZE_SHORT:
- part->function
= parse_word;
+ /* TODO: write parse_word func */
+ /*
part->function = parse_word; */
lsq_archive_set_property_type(archive, index, G_TYPE_UINT);
break;
case SIZE_LONG:
- part->function
= parse_dword;
+ /* TODO: write parse_dword func */
+ /*
part->function = parse_dword; */
lsq_archive_set_property_type(archive, index, G_TYPE_ULONG);
break;
case SIZE_LONGLONG:
- part->function
= parse_qword;
+ /* TODO: write parse_qword func */
+ /*
part->function = parse_qword; */
lsq_archive_set_property_type(archive, index, G_TYPE_UINT64);
break;
}
@@ -545,7 +550,8 @@
{
part_count++;
part->index = index;
- part->function = parse_char;
+ /* TODO: write parse_char func */
+ /* part->function = parse_char;
*/
lsq_archive_set_property_type(archive, index, G_TYPE_CHAR);
}
g_slist_prepend(parts, part);
@@ -567,19 +573,23 @@
switch(size_flag)
{
case SIZE_NORMAL:
- part->function
= parse_decimal;
+ /* TODO: write parse_decimal func */
+ /*
part->function = parse_decimal; */
lsq_archive_set_property_type(archive, index, G_TYPE_INT);
break;
case SIZE_SHORT:
- part->function
= parse_decimal16;
+ /* TODO: write parse_decimal16 func */
+ /*
part->function = parse_decimal16; */
lsq_archive_set_property_type(archive, index, G_TYPE_INT);
break;
case SIZE_LONG:
- part->function
= parse_decimal32;
+ /* TODO: write parse_decimal32 func */
+ /*
part->function = parse_decimal32; */
lsq_archive_set_property_type(archive, index, G_TYPE_LONG);
break;
case SIZE_LONGLONG:
- part->function
= parse_decimal64;
+ /* TODO: write parse_decimal64 func */
+ /*
part->function = parse_decimal64; */
lsq_archive_set_property_type(archive, index, G_TYPE_INT64);
break;
}
@@ -604,11 +614,13 @@
switch(size_flag)
{
case SIZE_NORMAL:
- part->function
= parse_floatingpoint;
+ /* TODO: write parse_floatingpoint func */
+ /*
part->function = parse_floatingpoint; */
lsq_archive_set_property_type(archive, index, G_TYPE_FLOAT);
break;
case SIZE_LONGLONG:
- part->function
= parse_double;
+ /* TODO: write parse_double func */
+ /*
part->function = parse_double; */
lsq_archive_set_property_type(archive, index, G_TYPE_DOUBLE);
break;
}
@@ -631,19 +643,23 @@
switch(size_flag)
{
case SIZE_NORMAL:
- part->function
= parse_octal;
+ /* TODO: write parse_octal func */
+ /*
part->function = parse_octal; */
lsq_archive_set_property_type(archive, index, G_TYPE_UINT);
break;
case SIZE_SHORT:
- part->function
= parse_octal16;
+ /* TODO: write parse_octal16 func */
+ /*
part->function = parse_octal16; */
lsq_archive_set_property_type(archive, index, G_TYPE_UINT);
break;
case SIZE_LONG:
- part->function
= parse_octal32;
+ /* TODO: write parse_octal32 func */
+ /*
part->function = parse_octal32; */
lsq_archive_set_property_type(archive, index, G_TYPE_ULONG);
break;
case SIZE_LONGLONG:
- part->function
= parse_octal64;
+ /* TODO: write parse_octal64 func */
+ /*
part->function = parse_octal64; */
lsq_archive_set_property_type(archive, index, G_TYPE_UINT64);
break;
}
@@ -665,7 +681,8 @@
{
part_count++;
part->index = index;
- part->function = parse_string;
+ /* TODO: write parse_string func */
+ /* part->function =
parse_string; */
lsq_archive_set_property_type(archive, index, G_TYPE_STRING);
}
g_slist_prepend(parts, part);
@@ -686,19 +703,23 @@
switch(size_flag)
{
case SIZE_NORMAL:
- part->function
= parse_unsigned;
+ /* TODO: write parse_unsigned func */
+ /*
part->function = parse_unsigned; */
lsq_archive_set_property_type(archive, index, G_TYPE_UINT);
break;
case SIZE_SHORT:
- part->function
= parse_unsigned16;
+ /* TODO: write parse_unsigned16 func */
+ /*
part->function = parse_unsigned16; */
lsq_archive_set_property_type(archive, index, G_TYPE_UINT);
break;
case SIZE_LONG:
- part->function
= parse_unsigned32;
+ /* TODO: write parse_unsigned32 func */
+ /*
part->function = parse_unsigned32; */
lsq_archive_set_property_type(archive, index, G_TYPE_ULONG);
break;
case SIZE_LONGLONG:
- part->function
= parse_unsigned64;
+ /* TODO: write parse_unsigned64 func */
+ /*
part->function = parse_unsigned64; */
lsq_archive_set_property_type(archive, index, G_TYPE_UINT64);
break;
}
@@ -722,19 +743,23 @@
switch(size_flag)
{
case SIZE_NORMAL:
- part->function
= parse_hexadecimal;
+ /* TODO: write parse_hexadecimal func */
+ /*
part->function = parse_hexadecimal; */
lsq_archive_set_property_type(archive, index, G_TYPE_UINT);
break;
case SIZE_SHORT:
- part->function
= parse_hexadecimal16;
+ /* TODO: write parse_hexadecimal16 func */
+ /*
part->function = parse_hexadecimal16; */
lsq_archive_set_property_type(archive, index, G_TYPE_UINT);
break;
case SIZE_LONG:
- part->function
= parse_hexadecimal32;
+ /* TODO: write parse_hexadecimal32 func */
+ /*
part->function = parse_hexadecimal32; */
lsq_archive_set_property_type(archive, index, G_TYPE_ULONG);
break;
case SIZE_LONGLONG:
- part->function
= parse_hexadecimal64;
+ /* TODO: write parse_hexadecimal64 func */
+ /*
part->function = parse_hexadecimal64; */
lsq_archive_set_property_type(archive, index, G_TYPE_UINT64);
break;
}
@@ -747,7 +772,8 @@
if(skip_flag || size_flag || width_flag)
return;
part = g_new0(parse_part, 1);
- part->function = parse_filename;
+ /* TODO: write parse_filename func */
+ /*part->function = parse_filename; */
g_slist_prepend(parts, part);
break;
/*}}}*/
@@ -758,7 +784,6 @@
}
}
- lsq_archive archive
}
parse()
Deleted: squeeze/trunk/missing
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
