comparison src/ft.c @ 4605:4fe88c94c3b4

[gaim-migrate @ 4892] I renamed dest_filename to local_filename, and made it so dest_filename is always the string containing the file on the local hard drive (for reading AND writing). I am of the belief that this is less ambiguous (that means it lives half its life on land and half its life in the water). committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 22 Feb 2003 22:09:44 +0000
parents 63c022ca157c
children 858979ab3867
comparison
equal deleted inserted replaced
4604:bf42e10c1d8a 4605:4fe88c94c3b4
77 g_free(xfer->filename); 77 g_free(xfer->filename);
78 78
79 if (xfer->remote_ip != NULL) g_free(xfer->remote_ip); 79 if (xfer->remote_ip != NULL) g_free(xfer->remote_ip);
80 if (xfer->local_ip != NULL) g_free(xfer->local_ip); 80 if (xfer->local_ip != NULL) g_free(xfer->local_ip);
81 81
82 if (xfer->dest_filename != NULL) 82 if (xfer->local_filename != NULL)
83 g_free(xfer->dest_filename); 83 g_free(xfer->local_filename);
84 84
85 g_free(xfer); 85 g_free(xfer);
86 } 86 }
87 87
88 void 88 void
145 g_free(filename); 145 g_free(filename);
146 146
147 return; 147 return;
148 } 148 }
149 149
150 gaim_xfer_set_filename(xfer, filename); 150 gaim_xfer_set_local_filename(xfer, filename);
151 gaim_xfer_set_size(xfer, sb.st_size); 151 gaim_xfer_set_size(xfer, sb.st_size);
152 } 152 }
153 else { 153 else {
154 /* TODO: Sanity checks and file overwrite checks. */ 154 /* TODO: Sanity checks and file overwrite checks. */
155 155
156 gaim_xfer_set_dest_filename(xfer, filename); 156 gaim_xfer_set_local_filename(xfer, filename);
157 } 157 }
158 158
159 g_free(filename); 159 g_free(filename);
160 160
161 xfer->ops.init(xfer); 161 xfer->ops.init(xfer);
205 205
206 return xfer->filename; 206 return xfer->filename;
207 } 207 }
208 208
209 const char * 209 const char *
210 gaim_xfer_get_dest_filename(const struct gaim_xfer *xfer) 210 gaim_xfer_get_local_filename(const struct gaim_xfer *xfer)
211 { 211 {
212 if (xfer == NULL) 212 if (xfer == NULL)
213 return NULL; 213 return NULL;
214 214
215 return xfer->dest_filename; 215 return xfer->local_filename;
216 } 216 }
217 217
218 size_t 218 size_t
219 gaim_xfer_get_bytes_sent(const struct gaim_xfer *xfer) 219 gaim_xfer_get_bytes_sent(const struct gaim_xfer *xfer)
220 { 220 {
311 311
312 xfer->filename = (filename == NULL ? NULL : g_strdup(filename)); 312 xfer->filename = (filename == NULL ? NULL : g_strdup(filename));
313 } 313 }
314 314
315 void 315 void
316 gaim_xfer_set_dest_filename(struct gaim_xfer *xfer, const char *filename) 316 gaim_xfer_set_local_filename(struct gaim_xfer *xfer, const char *filename)
317 { 317 {
318 if (xfer == NULL) 318 if (xfer == NULL)
319 return; 319 return;
320 320
321 if (xfer->dest_filename != NULL) 321 if (xfer->local_filename != NULL)
322 g_free(xfer->dest_filename); 322 g_free(xfer->local_filename);
323 323
324 xfer->dest_filename = (filename == NULL ? NULL : g_strdup(filename)); 324 xfer->local_filename = (filename == NULL ? NULL : g_strdup(filename));
325 } 325 }
326 326
327 void 327 void
328 gaim_xfer_set_size(struct gaim_xfer *xfer, size_t size) 328 gaim_xfer_set_size(struct gaim_xfer *xfer, size_t size)
329 { 329 {
522 522
523 /* 523 /*
524 * We'll have already tried to open this earlier to make sure we can 524 * We'll have already tried to open this earlier to make sure we can
525 * read/write here. Should be safe. 525 * read/write here. Should be safe.
526 */ 526 */
527 xfer->dest_fp = fopen(gaim_xfer_get_dest_filename(xfer), 527 xfer->dest_fp = fopen(gaim_xfer_get_local_filename(xfer),
528 type == GAIM_XFER_RECEIVE ? "wb" : "rb"); 528 type == GAIM_XFER_RECEIVE ? "wb" : "rb");
529 529
530 /* Just in case, though. */ 530 /* Just in case, though. */
531 if (xfer->dest_fp == NULL) { 531 if (xfer->dest_fp == NULL) {
532 gaim_xfer_cancel(xfer); /* ? */ 532 gaim_xfer_cancel(xfer); /* ? */