char *score_cache_filename;
};
+static void *CreateThreadData_ApiGetScore(int nr)
+{
+ struct ApiGetScoreThreadData *data =
+ checked_malloc(sizeof(struct ApiGetScoreThreadData));
+ char *score_cache_filename = getScoreCacheFilename(nr);
+
+ data->level_nr = nr;
+ data->score_cache_filename = getStringCopy(score_cache_filename);
+
+ return data;
+}
+
+static void FreeThreadData_ApiGetScore(void *data_raw)
+{
+ struct ApiGetScoreThreadData *data = data_raw;
+
+ checked_free(data->score_cache_filename);
+ checked_free(data);
+}
+
static void ApiGetScoreExt(struct HttpRequest *request,
struct HttpResponse *response,
- int level_nr,
- char *score_cache_filename)
+ void *data_raw)
{
+ struct ApiGetScoreThreadData *data = data_raw;
+ int level_nr = data->level_nr;
+ char *score_cache_filename = data->score_cache_filename;
+
request->hostname = setup.api_server_hostname;
request->port = API_SERVER_PORT;
request->method = API_SERVER_METHOD;
server_scores.updated = TRUE;
}
-static void ApiGetScore(int level_nr, char *score_cache_filename)
+static int ApiGetScoreThread(void *data_raw)
{
struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
ApiGetScoreExt(request, response,
- level_nr, score_cache_filename);
+ data_raw);
+
+ FreeThreadData_ApiGetScore(data_raw);
checked_free(request);
checked_free(response);
-}
-
-static int ApiGetScoreThread(void *data_raw)
-{
- struct ApiGetScoreThreadData *data = data_raw;
-
- ApiGetScore(data->level_nr,
- data->score_cache_filename);
-
- checked_free(data->score_cache_filename);
- checked_free(data);
return 0;
}
static void ApiGetScoreAsThread(int nr)
{
- struct ApiGetScoreThreadData *data =
- checked_malloc(sizeof(struct ApiGetScoreThreadData));
- char *score_cache_filename = getScoreCacheFilename(nr);
-
- data->level_nr = nr;
- data->score_cache_filename = getStringCopy(score_cache_filename);
+ struct ApiGetScoreThreadData *data = CreateThreadData_ApiGetScore(nr);
ExecuteAsThread(ApiGetScoreThread,
"ApiGetScore", data,
struct ScoreEntry score_entry;
};
+static void *CreateThreadData_ApiAddScore(int nr, char *score_tape_filename)
+{
+ struct ApiAddScoreThreadData *data =
+ checked_malloc(sizeof(struct ApiAddScoreThreadData));
+ struct ScoreEntry *score_entry = &scores.entry[scores.last_added];
+
+ if (score_tape_filename == NULL)
+ score_tape_filename = getScoreTapeFilename(score_entry->tape_basename, nr);
+
+ data->level_nr = nr;
+ data->score_entry = *score_entry;
+ data->score_tape_filename = getStringCopy(score_tape_filename);
+
+ return data;
+}
+
+static void FreeThreadData_ApiAddScore(void *data_raw)
+{
+ struct ApiAddScoreThreadData *data = data_raw;
+
+ checked_free(data->score_tape_filename);
+ checked_free(data);
+}
+
static void ApiAddScoreExt(struct HttpRequest *request,
struct HttpResponse *response,
- int level_nr,
- char *score_tape_filename,
- struct ScoreEntry *score_entry)
+ void *data_raw)
{
+ struct ApiAddScoreThreadData *data = data_raw;
+ int level_nr = data->level_nr;
+ char *score_tape_filename = data->score_tape_filename;
+ struct ScoreEntry *score_entry = &data->score_entry;
+
request->hostname = setup.api_server_hostname;
request->port = API_SERVER_PORT;
request->method = API_SERVER_METHOD;
server_scores.uploaded = TRUE;
}
-static void ApiAddScore(int level_nr, char *score_tape_filename,
- struct ScoreEntry *score_entry)
+static int ApiAddScoreThread(void *data_raw)
{
struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
ApiAddScoreExt(request, response,
- level_nr, score_tape_filename, score_entry);
+ data_raw);
+
+ FreeThreadData_ApiAddScore(data_raw);
checked_free(request);
checked_free(response);
-}
-
-static int ApiAddScoreThread(void *data_raw)
-{
- struct ApiAddScoreThreadData *data = data_raw;
-
- ApiAddScore(data->level_nr,
- data->score_tape_filename,
- &data->score_entry);
-
- checked_free(data->score_tape_filename);
- checked_free(data);
return 0;
}
static void ApiAddScoreAsThread(int nr, char *score_tape_filename)
{
struct ApiAddScoreThreadData *data =
- checked_malloc(sizeof(struct ApiAddScoreThreadData));
- struct ScoreEntry *score_entry = &scores.entry[scores.last_added];
-
- if (score_tape_filename == NULL)
- score_tape_filename = getScoreTapeFilename(score_entry->tape_basename, nr);
-
- data->level_nr = nr;
- data->score_entry = *score_entry;
- data->score_tape_filename = getStringCopy(score_tape_filename);
+ CreateThreadData_ApiAddScore(nr, score_tape_filename);
ExecuteAsThread(ApiAddScoreThread,
"ApiAddScore", data,