S3Store cleanup.

Just moving code around; no functional changes.

diff --git a/bluesky/s3store.c b/bluesky/s3store.c
index 2e1eb17..d742e3b 100644 (file)
--- a/bluesky/s3store.c
+++ b/bluesky/s3store.c
@@ -28,43 +28,16 @@ typedef struct {
     BlueSkyRCStr *data;
 } S3Op;
 
-static void s3store_task(gpointer s, gpointer o);
-
-static gpointer s3store_new()
-{
-    S3Store *store = g_new(S3Store, 1);
-    store->thread_pool = g_thread_pool_new(s3store_task, store, -1, FALSE,
-                                           NULL);
-    store->bucket.bucketName = "mvrable-bluesky";
-    store->bucket.protocol = S3ProtocolHTTP;
-    store->bucket.uriStyle = S3UriStylePath;
-    store->bucket.accessKeyId = getenv("AWS_ACCESS_KEY_ID");
-    store->bucket.secretAccessKey = getenv("AWS_SECRET_ACCESS_KEY");
-
-    const char *key = getenv("BLUESKY_KEY");
-    if (key == NULL) {
-        g_error("Encryption key not defined; please set BLUESKY_KEY environment variable");
-        exit(1);
-    }
-
-    bluesky_crypt_hash_key(key, store->encryption_key);
-
-    g_print("Initializing S3 with bucket %s, access key %s, encryption key %s\n",
-            store->bucket.bucketName, store->bucket.accessKeyId, key);
-
-    return store;
-}
-
-static void s3store_destroy(gpointer store)
-{
-    g_free(store);
-}
-
 struct get_info {
     int success;
     GString *buf;
 };
 
+struct put_info {
+    BlueSkyRCStr *val;
+    gint offset;
+};
+
 static S3Status s3store_get_handler(int bufferSize, const char *buffer,
                                     void *callbackData)
 {
@@ -73,11 +46,6 @@ static S3Status s3store_get_handler(int bufferSize, const char *buffer,
     return S3StatusOK;
 }
 
-struct put_info {
-    BlueSkyRCStr *val;
-    gint offset;
-};
-
 static int s3store_put_handler(int bufferSize, char *buffer,
                                void *callbackData)
 {
@@ -191,6 +159,36 @@ static void s3store_task(gpointer o, gpointer s)
     g_print("Finish task...\n");
 }
 
+static gpointer s3store_new()
+{
+    S3Store *store = g_new(S3Store, 1);
+    store->thread_pool = g_thread_pool_new(s3store_task, store, -1, FALSE,
+                                           NULL);
+    store->bucket.bucketName = "mvrable-bluesky";
+    store->bucket.protocol = S3ProtocolHTTP;
+    store->bucket.uriStyle = S3UriStylePath;
+    store->bucket.accessKeyId = getenv("AWS_ACCESS_KEY_ID");
+    store->bucket.secretAccessKey = getenv("AWS_SECRET_ACCESS_KEY");
+
+    const char *key = getenv("BLUESKY_KEY");
+    if (key == NULL) {
+        g_error("Encryption key not defined; please set BLUESKY_KEY environment variable");
+        exit(1);
+    }
+
+    bluesky_crypt_hash_key(key, store->encryption_key);
+
+    g_print("Initializing S3 with bucket %s, access key %s, encryption key %s\n",
+            store->bucket.bucketName, store->bucket.accessKeyId, key);
+
+    return store;
+}
+
+static void s3store_destroy(gpointer store)
+{
+    g_free(store);
+}
+
 static BlueSkyStoreImplementation store_impl = {
     .create = s3store_new,
     .destroy = s3store_destroy,