X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=config-ui%2Fsave-config.c;h=4415b9934029315aa1b26cd856f1ece185b9a12b;hp=4a066f5ac8f37ff3231c79615a697d5560454763;hb=cb1fde430bf96d9c60b5dcd6e754e5028545b853;hpb=477b01a24f842c98e8abac56e3fe2ffb3d3a56db;ds=sidebyside

diff --git a/config-ui/save-config.c b/config-ui/save-config.c
index 4a066f5..4415b99 100644
--- a/config-ui/save-config.c
+++ b/config-ui/save-config.c
@@ -21,6 +21,7 @@
  */
 
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
@@ -35,28 +36,28 @@ extern struct swb_config_option swb_config_options[];
 /* Outputs a config file line for the named option to a file descriptor */
 static void swb_config_output_option(FILE *fp, unsigned int *oldcfg_seen,
 			      struct swb_config *cfg, char *name) {
-	int i;
-	struct swb_config_option opt;
+	struct swb_config_option *opt;
+	ptrdiff_t i;
 	
-	for (i = 0; swb_config_options[i].name; ++i) {
-		opt = swb_config_options[i];
-		if (strcmp(opt.name, name))
+	for (opt = swb_config_options; opt->name; ++opt) {
+		if (strcmp(opt->name, name))
 			continue;
 
-		if (!(*oldcfg_seen & opt.set_mask) &&
-		    (cfg->flags & opt.set_mask)) {
-			switch (opt.type) {
+		i = opt - swb_config_options;
+		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,
+					opt->name,
 					*(char **)cfg->entries[i]);
-				*oldcfg_seen |= opt.set_mask;
+				*oldcfg_seen |= opt->set_mask;
 				break;
 			  case SWB_CONFIG_OPT_INT:
 				fprintf(fp, "%s = %d\n",
-					opt.name,
+					opt->name,
 					*(int *)cfg->entries[i]);
-				*oldcfg_seen |= opt.set_mask;
+				*oldcfg_seen |= opt->set_mask;
 				break;
 			}
 		}