commit 74d30a5

Some symbol renaming.

 1@@ -15,10 +15,10 @@
 2 #include <sys/file.h>
 3 #include <fcntl.h>
 4 
 5-double db_layout = 2.7;
 6+double disk_layout = 2.7;
 7 
 8 
 9-int db_upgrade(d_char **error);
10+int snac_upgrade(d_char **error);
11 
12 int srv_open(char *basedir, int auto_upgrade)
13 /* opens a server */
14@@ -71,9 +71,9 @@ int srv_open(char *basedir, int auto_upgrade)
15                 }
16 
17                 if (auto_upgrade)
18-                    ret = db_upgrade(&error);
19+                    ret = snac_upgrade(&error);
20                 else {
21-                    if (xs_number_get(xs_dict_get(srv_config, "layout")) < db_layout)
22+                    if (xs_number_get(xs_dict_get(srv_config, "layout")) < disk_layout)
23                         error = xs_fmt("ERROR: disk layout changed - execute 'snac upgrade' first");
24                     else
25                         ret = 1;

1@@ -5,7 +5,7 @@
2 
3 #define USER_AGENT "snac/" VERSION
4 
5-extern double db_layout;
6+extern double disk_layout;
7 extern d_char *srv_basedir;
8 extern d_char *srv_config;
9 extern d_char *srv_baseurl;

 1@@ -11,7 +11,7 @@
 2 #include <sys/stat.h>
 3 
 4 
 5-int db_upgrade(d_char **error)
 6+int snac_upgrade(xs_str **error)
 7 {
 8     int ret = 1;
 9     int changed = 0;
10@@ -23,10 +23,10 @@ int db_upgrade(d_char **error)
11 
12         f = nf = xs_number_get(layout);
13 
14-        if (!(f < db_layout))
15+        if (!(f < disk_layout))
16             break;
17 
18-        srv_log(xs_fmt("db_upgrade %1.1lf < %1.1lf", f, db_layout));
19+        srv_log(xs_fmt("disk layout upgrade needed (%1.1lf < %1.1lf)", f, disk_layout));
20 
21         if (f < 2.0) {
22             *error = xs_fmt("ERROR: unsupported old disk layout %1.1lf\n", f);
23@@ -294,14 +294,14 @@ int db_upgrade(d_char **error)
24             xs *nv     = xs_number_new(f);
25             srv_config = xs_dict_set(srv_config, "layout", nv);
26 
27-            srv_log(xs_fmt("db_upgrade converted to version %1.1lf", f));
28+            srv_log(xs_fmt("disk layout upgraded to version %1.1lf", f));
29             changed++;
30         }
31         else
32             break;
33     }
34 
35-    if (f > db_layout) {
36+    if (f > disk_layout) {
37         *error = xs_fmt("ERROR: unknown future version %lf\n", f);
38         ret    = 0;
39     }
40@@ -316,7 +316,7 @@ int db_upgrade(d_char **error)
41             fwrite(j, strlen(j), 1, f);
42             fclose(f);
43 
44-            srv_log(xs_fmt("upgraded db %s after %d changes", fn, changed));
45+            srv_log(xs_fmt("disk layout upgraded %s after %d changes", fn, changed));
46         }
47         else
48             ret = 0;

1@@ -103,7 +103,7 @@ int initdb(const char *basedir)
2 
3     srv_config = xs_json_loads(default_srv_config);
4 
5-    xs *layout = xs_number_new(db_layout);
6+    xs *layout = xs_number_new(disk_layout);
7     srv_config = xs_dict_set(srv_config, "layout", layout);
8 
9     printf("Network address [%s]:\n", xs_dict_get(srv_config, "address"));