Преглед на файлове

Use c99 types conservatively to compile on OpenBSD. Also convert to or from

time_t via long.
master
Richard Nyberg преди 19 години
родител
ревизия
c865aa9254
променени са 4 файла, в които са добавени 13 реда и са изтрити 13 реда
  1. +3
    -3
      btpd/cli_if.c
  2. +2
    -2
      btpd/content.c
  3. +4
    -4
      btpd/tracker_req.c
  4. +4
    -4
      misc/metainfo.c

+ 3
- 3
btpd/cli_if.c Целия файл

@@ -72,9 +72,9 @@ cmd_stat(struct cli *cli, int argc, const char *args)
seen_npieces++; seen_npieces++;


buf_swrite(&iob, "d"); buf_swrite(&iob, "d");
buf_print(&iob, "11:content goti%jde", (intmax_t)cm_content(tp)); buf_print(&iob, "11:content goti%llde", (long long)cm_content(tp));
buf_print(&iob, "12:content sizei%jde", buf_print(&iob, "12:content sizei%llde",
(intmax_t)tp->meta.total_length); (long long)tp->meta.total_length);
buf_print(&iob, "10:downloadedi%llde", tp->net->downloaded); buf_print(&iob, "10:downloadedi%llde", tp->net->downloaded);
buf_swrite(&iob, "9:info hash20:"); buf_swrite(&iob, "9:info hash20:");
buf_write(&iob, tp->meta.info_hash, 20); buf_write(&iob, tp->meta.info_hash, 20);


+ 2
- 2
btpd/content.c Целия файл

@@ -622,7 +622,7 @@ load_resume(struct torrent *tp, struct rstat sbs[])
goto invalid; goto invalid;
for (int i = 0; i < tp->meta.nfiles; i++) { for (int i = 0; i < tp->meta.nfiles; i++) {
long long size; long long size;
time_t time; long time;
if (fscanf(fp, "%qd %ld\n", &size, &time) != 2) if (fscanf(fp, "%qd %ld\n", &size, &time) != 2)
goto invalid; goto invalid;
if (sbs[i].size != size || sbs[i].mtime != time) if (sbs[i].size != size || sbs[i].mtime != time)
@@ -650,7 +650,7 @@ save_resume(struct torrent *tp, struct rstat sbs[])
return err; return err;
fprintf(fp, "%d\n", 1); fprintf(fp, "%d\n", 1);
for (int i = 0; i < tp->meta.nfiles; i++) for (int i = 0; i < tp->meta.nfiles; i++)
fprintf(fp, "%qd %ld\n", (long long)sbs[i].size, sbs[i].mtime); fprintf(fp, "%qd %ld\n", (long long)sbs[i].size, (long)sbs[i].mtime);
fwrite(tp->cm->piece_field, 1, ceil(tp->meta.npieces / 8.0), fp); fwrite(tp->cm->piece_field, 1, ceil(tp->meta.npieces / 8.0), fp);
fwrite(tp->cm->block_field, 1, tp->meta.npieces * tp->cm->bppbf, fp); fwrite(tp->cm->block_field, 1, tp->meta.npieces * tp->cm->bppbf, fp);
if (fclose(fp) != 0) if (fclose(fp) != 0)


+ 4
- 4
btpd/tracker_req.c Целия файл

@@ -195,11 +195,11 @@ tr_send(struct torrent *tp, enum tr_event event)
snprintf(e_id + i * 3, 4, "%%%.2x", peer_id[i]); snprintf(e_id + i * 3, 4, "%%%.2x", peer_id[i]);


http_get(&tr->req, http_cb, tp, http_get(&tr->req, http_cb, tp,
"%s%cinfo_hash=%s&peer_id=%s&port=%d&uploaded=%ju" "%s%cinfo_hash=%s&peer_id=%s&port=%d&uploaded=%llu"
"&downloaded=%ju&left=%ju&compact=1%s%s", "&downloaded=%llu&left=%llu&compact=1%s%s",
tp->meta.announce, qc, e_hash, e_id, net_port, tp->meta.announce, qc, e_hash, e_id, net_port,
(intmax_t)tp->net->uploaded, (intmax_t)tp->net->downloaded, tp->net->uploaded, tp->net->downloaded,
(intmax_t)tp->meta.total_length - cm_content(tp), (long long)tp->meta.total_length - cm_content(tp),
event == TR_EV_EMPTY ? "" : "&event=", m_events[event]); event == TR_EV_EMPTY ? "" : "&event=", m_events[event]);
} }




+ 4
- 4
misc/metainfo.c Целия файл

@@ -40,16 +40,16 @@ print_metainfo(struct metainfo *tp)
printf("%.2x", tp->info_hash[i]); printf("%.2x", tp->info_hash[i]);
printf("\n"); printf("\n");
printf("Tracker URL: %s\n", tp->announce); printf("Tracker URL: %s\n", tp->announce);
printf("Piece length: %jd\n", (intmax_t)tp->piece_length); printf("Piece length: %lld\n", (long long)tp->piece_length);
printf("Number of pieces: %u\n", tp->npieces); printf("Number of pieces: %u\n", tp->npieces);
printf("Number of files: %u\n", tp->nfiles); printf("Number of files: %u\n", tp->nfiles);
printf("Advisory name: %s\n", tp->name); printf("Advisory name: %s\n", tp->name);
printf("Files:\n"); printf("Files:\n");
for (i = 0; i < tp->nfiles; i++) { for (i = 0; i < tp->nfiles; i++) {
printf("%s (%jd)\n", printf("%s (%lld)\n",
tp->files[i].path, (intmax_t)tp->files[i].length); tp->files[i].path, (long long)tp->files[i].length);
} }
printf("Total length: %jd\n\n", (intmax_t)tp->total_length); printf("Total length: %lld\n\n", (long long)tp->total_length);
} }


static int static int


||||||
x
 
000:0
Loading…
Отказ
Запис