Changeset 4634

Timestamp:

02/15/07 00:09:58 (2 years ago)

Author:

morris

Message:

Merge from trunk

Files:

• wired/branches/p7/wired/files.c (modified) (3 diffs)
• wired/branches/p7/wired/server.c (modified) (1 diff)
• wired/branches/p7/wired/transfers.c (modified) (3 diffs)

wired/branches/p7/wired/files.c

@@ -456 +456 @@
-        }
-
-name, realtoname
+path, realtopath
-                path = wi_file_temporary_path_with_template(
-                        wi_string_with_format(WI_STR("%@/.%@.XXXXXXXX"),
@@ -493 +493 @@
-                        
-                        wi_release(array);
+                        
+                        result = true;
-                } else {
-                        wi_log_warn(WI_STR("Could not rename %@ to %@: %m"),
@@ -523 +525 @@
-                }
-        } else {
-: %m"), realfrom
+ to %@: %m"), realfrompath, realto
-        }
-        

wired/branches/p7/wired/server.c

@@ -203 +203 @@
-                        
-                        if(data) {
+                                wi_release(wd_banner);
-                                wd_banner = wi_retain(wi_data_base64(data));
-                                wi_release(data);
-                        } else {
-                                wi_log_err(WI_STR("Could not open %@: %m"), wd_settings.banner);
-                        }
+
+                        wi_release(data);
-                }
-        } else {

wired/branches/p7/wired/transfers.c

@@ -320 +320 @@
-        wi_uinteger_t           position;
-        wi_uinteger_t           i, count;
+        wi_uinteger_t           total_downloads, total_uploads, client_downloads, client_uploads;
-        wi_boolean_t            queue;
-        
@@ -325 +326 @@
-        wi_lock_lock(wd_transfers_status_lock);
-        
+        total_downloads = wd_settings.totaldownloads;
+        client_downloads = wd_settings.clientdownloads;
+        total_uploads = wd_settings.totaluploads;
+        client_uploads = wd_settings.clientuploads;
+
-        clients = wi_set_init(wi_set_alloc());
-        count = wi_array_count(wd_transfers);
@@ -351 +357 @@
-                                
-                                if(transfer->type == WD_TRANSFER_DOWNLOAD) {
-
-
+
+
+
-                                } else {
-
-
+
+
+
-                                }
-