X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=config-ui%2Fsave-config.c;h=6cb7d5ca6d1983fc761b5458e471915b05a1eba7;hp=1787f0ef39e55af749247542352a07f046fc8eb0;hb=fd200ff52e139d2180003a8711cbde56dd7e8126;hpb=3cc94f16ef41a2784c4185d52536f0d2e7c6610b

diff --git a/config-ui/save-config.c b/config-ui/save-config.c
index 1787f0e..6cb7d5c 100644
--- a/config-ui/save-config.c
+++ b/config-ui/save-config.c
@@ -21,7 +21,6 @@
  */
 
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
@@ -41,26 +40,26 @@ extern struct swb_config_option swb_config_options[];
 static void swb_config_output_option(FILE *fp, unsigned int *oldcfg_seen,
 			      struct swb_config *cfg, char *name) {
 	struct swb_config_option *opt;
-	ptrdiff_t i;
+	void *entry;
 
 	for (opt = swb_config_options; opt->name; ++opt) {
 		if (strcmp(opt->name, name))
 			continue;
 
-		i = opt - swb_config_options;
+		entry = (char *)cfg + opt->offset;
 		if (!(*oldcfg_seen & opt->set_mask) &&
 		    (cfg->flags & opt->set_mask)) {
 			switch (opt->type) {
 			  case SWB_CONFIG_OPT_STRING:
 				fprintf(fp, "%s = \"%s\"\n",
 					opt->name,
-					*(char **)cfg->entries[i]);
+					*(char **)entry);
 				*oldcfg_seen |= opt->set_mask;
 				break;
 			  case SWB_CONFIG_OPT_INT:
 				fprintf(fp, "%s = %d\n",
 					opt->name,
-					*(int *)cfg->entries[i]);
+					*(int *)entry);
 				*oldcfg_seen |= opt->set_mask;
 				break;
 			}