[axel-commits] r79 - in /branches/3.x-broken/src: axel.c axel.h conn.c messages.h
phihag-guest at users.alioth.debian.org
phihag-guest at users.alioth.debian.org
Tue Dec 30 20:13:35 UTC 2008
Author: phihag-guest
Date: Tue Dec 30 20:13:35 2008
New Revision: 79
URL: http://svn.debian.org/wsvn/axel/?sc=1&rev=79
Log:
Move some stuff around to modularize
Modified:
branches/3.x-broken/src/axel.c
branches/3.x-broken/src/axel.h
branches/3.x-broken/src/conn.c
branches/3.x-broken/src/messages.h
Modified: branches/3.x-broken/src/axel.c
URL: http://svn.debian.org/wsvn/axel/branches/3.x-broken/src/axel.c?rev=79&op=diff
==============================================================================
--- branches/3.x-broken/src/axel.c (original)
+++ branches/3.x-broken/src/axel.c Tue Dec 30 20:13:35 2008
@@ -30,6 +30,7 @@
static void axel_save_state(axel_t* axel);
static void axel_set_state(axel_t* axel, int state);
static void axel_update_display(const axel_t* axel);
+static void axel_startthread(conn_t* conn);
/**
* Add a URL. urlstr is a pointer to a string specified by the user
@@ -211,7 +212,15 @@
axel_update_display();
}
-
+// Start a new thread that immediately executes afterwards.
+_Bool axel_startthread(conn_t* c) {
+ if (pthread_create(conn->thread, NULL, conn_threadstart, c) != 0) {
+ axel_message(conn->axel, critical, _("Thread creation failed"));
+ return false;
+ }
+
+ return true;
+}
Modified: branches/3.x-broken/src/axel.h
URL: http://svn.debian.org/wsvn/axel/branches/3.x-broken/src/axel.h?rev=79&op=diff
==============================================================================
--- branches/3.x-broken/src/axel.h (original)
+++ branches/3.x-broken/src/axel.h Tue Dec 30 20:13:35 2008
@@ -45,6 +45,7 @@
#include "conn.h"
#include "search.h"
#include "urllist.h"
+#include "messages.h"
// Emergency error codes
#define AXEL_EXIT_MALLOC_FAIL 91
@@ -135,7 +136,4 @@
axel_state axel_download(axel_t* axel);
void axel_destroy(axel_t* axel);
-// These functions are only called from axel's core
-void axel_message(const axel_t* axel, int verbosity, const char* message);
-void axel_message_fmt(const axel_t *axel, int verbosity, const char *format, ... );
-void axel_message_heap(const axel_t* axel, int verbosity, const char* message);
+// For other functions called only from axel's core, see messages.h
Modified: branches/3.x-broken/src/conn.c
URL: http://svn.debian.org/wsvn/axel/branches/3.x-broken/src/conn.c?rev=79&op=diff
==============================================================================
--- branches/3.x-broken/src/conn.c (original)
+++ branches/3.x-broken/src/conn.c Tue Dec 30 20:13:35 2008
@@ -28,7 +28,7 @@
static void conn_start_threadstart(void* conn);
void conn_init(conn_t *c, const url_t* url, const axel_t* axel, AXEL_SIZE startbyte, AXEL_SIZE endbyte) {
- c->conf = conf;
+ c->axel = axel;
c->url = url;
proto_init(c->proto, url->protoid);
@@ -37,17 +37,7 @@
c->cstate = INITIALIZED;
}
-// Start a new thread.
-_Bool conn_start(conn_t* c) {
- if (pthread_create(conn->thread, NULL, conn_threadstart, c) != 0) {
- axel_message(conn->axel, _("Thread creation failed"));
- return false;
- }
-
- return true;
-}
-
-// Entry point for the created thread
+// Entry point for a created thread
void conn_threadstart(void* conn_void) {
int oldstate; // Dummy
Modified: branches/3.x-broken/src/messages.h
URL: http://svn.debian.org/wsvn/axel/branches/3.x-broken/src/messages.h?rev=79&op=diff
==============================================================================
--- branches/3.x-broken/src/messages.h (original)
+++ branches/3.x-broken/src/messages.h Tue Dec 30 20:13:35 2008
@@ -17,3 +17,8 @@
typedef struct message_struct message_t;
+
+// These functions are only called from axel's core
+void axel_message(const axel_t* axel, int verbosity, const char* message);
+void axel_message_fmt(const axel_t *axel, int verbosity, const char *format, ... );
+void axel_message_heap(const axel_t* axel, int verbosity, const char* message);
More information about the axel-commits
mailing list