diff options
| -rw-r--r-- | Alc/ALc.c | 8 | ||||
| -rw-r--r-- | Alc/alcConfig.c | 2 | ||||
| -rw-r--r-- | Alc/wave.c | 3 |
3 files changed, 7 insertions, 6 deletions
@@ -169,11 +169,11 @@ static const ALCchar alcErrOutOfMemory[] = "Out of Memory"; /* Device lists. Sizes only include the first ending null character, not the * second */ static ALCchar *alcDeviceList; -static ALCuint alcDeviceListSize; +static size_t alcDeviceListSize; static ALCchar *alcAllDeviceList; -static ALCuint alcAllDeviceListSize; +static size_t alcAllDeviceListSize; static ALCchar *alcCaptureDeviceList; -static ALCuint alcCaptureDeviceListSize; +static size_t alcCaptureDeviceListSize; // Default is always the first in the list static ALCchar *alcDefaultDeviceSpecifier; static ALCchar *alcDefaultAllDeviceSpecifier; @@ -420,7 +420,7 @@ static void ProbeCaptureDeviceList() #define DECL_APPEND_LIST_FUNC(type) \ void Append##type##List(const ALCchar *name) \ { \ - ALCuint len = strlen(name); \ + size_t len = strlen(name); \ void *temp; \ \ if(len == 0) \ diff --git a/Alc/alcConfig.c b/Alc/alcConfig.c index fadc3c9c..b7e131ef 100644 --- a/Alc/alcConfig.c +++ b/Alc/alcConfig.c @@ -212,7 +212,7 @@ void ReadALConfig(void) #ifdef _WIN32 if(SHGetSpecialFolderPathA(NULL, buffer, CSIDL_APPDATA, FALSE) != FALSE) { - int p = strlen(buffer); + size_t p = strlen(buffer); snprintf(buffer+p, sizeof(buffer)-p, "\\alsoft.ini"); f = fopen(buffer, "rt"); if(f) @@ -172,6 +172,7 @@ static ALCboolean wave_reset_playback(ALCdevice *device) { wave_data *data = (wave_data*)device->ExtraData; ALuint channels, bits, i; + size_t val; fseek(data->f, 0, SEEK_SET); clearerr(data->f); @@ -244,7 +245,7 @@ static ALCboolean wave_reset_playback(ALCdevice *device) fputc((i>>16)&0xff, data->f); fputc((i>>24)&0xff, data->f); // 16 byte GUID, sub-type format - i = fwrite(((bits==32) ? SUBTYPE_FLOAT : SUBTYPE_PCM), 1, 16, data->f); + val = fwrite(((bits==32) ? SUBTYPE_FLOAT : SUBTYPE_PCM), 1, 16, data->f); fprintf(data->f, "data"); fputc(0xFF, data->f); // 'data' header len; filled in at close |