| 修订版 | bfa98fab4f5deefa733f5dd6fdc79c50d9b0a579 (tree) |
|---|---|
| 时间 | 2020-06-02 22:52:56 |
| 作者 | Starg <starg@user...> |
| Commiter | Starg |
Merge branch 'dev41' into unicode
libarc/url.c (diff)
libarc/url.h (diff) sf_view_gui/mysndfont.c (diff) timidity/common.c (diff)| @@ -360,7 +360,7 @@ off_size_t url_tell(URL url) | ||
| 360 | 360 | return url->url_tell(url); |
| 361 | 361 | } |
| 362 | 362 | |
| 363 | -void url_skip(URL url, ptr_size_t n) | |
| 363 | +void url_skip(URL url, off_size_t n) | |
| 364 | 364 | { |
| 365 | 365 | char tmp[BUFSIZ]; |
| 366 | 366 |
| @@ -383,7 +383,7 @@ void url_skip(URL url, ptr_size_t n) | ||
| 383 | 383 | |
| 384 | 384 | while (n > 0) |
| 385 | 385 | { |
| 386 | - ptr_size_t c; | |
| 386 | + off_size_t c; | |
| 387 | 387 | |
| 388 | 388 | c = n; |
| 389 | 389 | if (c > sizeof(tmp)) |
| @@ -115,7 +115,7 @@ extern off_size_t url_seek_uint64(URL url, uint64 offset, int whence); | ||
| 115 | 115 | extern off_size_t url_tell(URL url); |
| 116 | 116 | |
| 117 | 117 | /* skip n bytes */ |
| 118 | -extern void url_skip(URL url, ptr_size_t n); | |
| 118 | +extern void url_skip(URL url, off_size_t n); | |
| 119 | 119 | |
| 120 | 120 | /* seek to first position */ |
| 121 | 121 | extern void url_rewind(URL url); |
| @@ -248,9 +248,7 @@ enum url_news_conn_type | ||
| 248 | 248 | #define IS_URL_SEEK_SAFE(url) ((url)->url_seek && \ |
| 249 | 249 | (url)->type != URL_buff_t) |
| 250 | 250 | |
| 251 | -#if -1L != (-1L >> 1) | |
| 252 | -#define URL_MAX_READLIMIT ((~(off_size_t)0L) >> 1) | |
| 253 | -#elif _FILE_OFFSET_BITS > 32 | |
| 251 | +#ifdef HAVE_OFF_SIZE_T_64BIT | |
| 254 | 252 | #define URL_MAX_READLIMIT ((off_size_t)0x7fffffffffffffffLL) |
| 255 | 253 | #else |
| 256 | 254 | #define URL_MAX_READLIMIT ((off_size_t)0x7fffffffL) |
| @@ -279,7 +279,7 @@ void CreateSoundFontTree(HWND hDlg, LPCSTR x_sf_filename_) | ||
| 279 | 279 | // if (x_cfg_info.d_rom[x_preset][x_keynote]) |
| 280 | 280 | // sprintf(str_, "Bank%03d Note%03d[ROM] %s\0\0", x_preset, x_keynote, pname_); |
| 281 | 281 | // else |
| 282 | - sprintf(str_, "%03d:%03d %s\0\0", x_preset, x_keynote, pname_); | |
| 282 | + snprintf(str_, sizeof(str_) / sizeof(str_[0]), "%03d:%03d %s\0\0", x_preset, x_keynote, pname_); | |
| 283 | 283 | |
| 284 | 284 | tv.item.pszText = str_; |
| 285 | 285 | tv.item.cchTextMax = strlen(str_); |
| @@ -601,7 +601,7 @@ void close_file(struct timidity_file *tf) | ||
| 601 | 601 | /* This is meant for skipping a few bytes. */ |
| 602 | 602 | void skip(struct timidity_file *tf, size_t len) |
| 603 | 603 | { |
| 604 | - url_skip(tf->url, (long)len); | |
| 604 | + url_skip(tf->url, (off_size_t)len); | |
| 605 | 605 | } |
| 606 | 606 | |
| 607 | 607 | char *tf_gets(char *buff, size_t n, struct timidity_file *tf) |
Fork