jessica
/
Jupiter
mirror of https://github.com/JAJames/Jupiter.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed avformat returning the wrong length.

release/0.19
JustinAJ 11 years ago
parent
68bae44233
commit
b63c3e9be8
1 changed files with 14 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      Jupiter/CString_Imp.h

24
Jupiter/CString_Imp.h
View File

@ -482,10 +482,11 @@ template<> size_t inline Jupiter::CString_Strict<char>::avformat(const char *for
Jupiter::CString_Type<char>::base = t; Jupiter::CString_Type<char>::base = t;
Jupiter::CString_Type<char>::curr = Jupiter::CString_Type<char>::base; Jupiter::CString_Type<char>::curr = Jupiter::CString_Type<char>::base;
vsnprintf(Jupiter::CString_Type<char>::curr + Jupiter::CString_Type<char>::strLen, minLen, format, args); minLen = vsnprintf(Jupiter::CString_Type<char>::curr + Jupiter::CString_Type<char>::strLen, minLen, format, args);
if (minLen <= 0) return 0;
Jupiter::CString_Type<char>::strLen += minLen; Jupiter::CString_Type<char>::strLen += minLen;
Jupiter::CString_Type<char>::curr[Jupiter::CString_Type<char>::strLen] = 0; Jupiter::CString_Type<char>::curr[Jupiter::CString_Type<char>::strLen] = 0;
return Jupiter::CString_Type<char>::strLen; return minLen;
} }
template<> size_t inline Jupiter::CString_Strict<wchar_t>::avformat(const wchar_t *format, va_list args) template<> size_t inline Jupiter::CString_Strict<wchar_t>::avformat(const wchar_t *format, va_list args)
@ -503,10 +504,11 @@ template<> size_t inline Jupiter::CString_Strict<wchar_t>::avformat(const wchar_
Jupiter::CString_Type<wchar_t>::base = t; Jupiter::CString_Type<wchar_t>::base = t;
Jupiter::CString_Type<wchar_t>::curr = Jupiter::CString_Type<wchar_t>::base; Jupiter::CString_Type<wchar_t>::curr = Jupiter::CString_Type<wchar_t>::base;
vswprintf(Jupiter::CString_Type<wchar_t>::curr + Jupiter::CString_Type<wchar_t>::strLen, minLen, format, args); minLen = vswprintf(Jupiter::CString_Type<wchar_t>::curr + Jupiter::CString_Type<wchar_t>::strLen, minLen, format, args);
if (minLen <= 0) return 0;
Jupiter::CString_Type<wchar_t>::strLen += minLen; Jupiter::CString_Type<wchar_t>::strLen += minLen;
Jupiter::CString_Type<wchar_t>::curr[Jupiter::CString_Type<wchar_t>::strLen] = 0; Jupiter::CString_Type<wchar_t>::curr[Jupiter::CString_Type<wchar_t>::strLen] = 0;
return Jupiter::CString_Type<wchar_t>::strLen; return minLen;
} }
template<typename T> size_t Jupiter::CString_Strict<T>::avformat(const T *format, va_list args) template<typename T> size_t Jupiter::CString_Strict<T>::avformat(const T *format, va_list args)
@ -896,10 +898,11 @@ template<> size_t inline Jupiter::CString_Loose<char>::avformat(const char *form
Jupiter::strcpy<char>(Jupiter::CString_Type<char>::base, Jupiter::CString_Type<char>::curr); Jupiter::strcpy<char>(Jupiter::CString_Type<char>::base, Jupiter::CString_Type<char>::curr);
Jupiter::CString_Type<char>::curr = Jupiter::CString_Type<char>::base; Jupiter::CString_Type<char>::curr = Jupiter::CString_Type<char>::base;
} }
vsnprintf(Jupiter::CString_Type<char>::curr + Jupiter::CString_Type<char>::strLen, Jupiter::CString_Loose<char>::strSize - Jupiter::CString_Type<char>::strLen, format, args); minLen = vsnprintf(Jupiter::CString_Type<char>::curr + Jupiter::CString_Type<char>::strLen, Jupiter::CString_Loose<char>::strSize - Jupiter::CString_Type<char>::strLen, format, args);
Jupiter::CString_Type<char>::strLen = minLen; if (minLen <= 0) return 0;
Jupiter::CString_Type<char>::strLen += minLen;
Jupiter::CString_Type<char>::curr[Jupiter::CString_Type<char>::strLen] = 0; Jupiter::CString_Type<char>::curr[Jupiter::CString_Type<char>::strLen] = 0;
return Jupiter::CString_Type<char>::strLen; return minLen;
} }
template<> size_t inline Jupiter::CString_Loose<wchar_t>::avformat(const wchar_t *format, va_list args) template<> size_t inline Jupiter::CString_Loose<wchar_t>::avformat(const wchar_t *format, va_list args)
@ -925,10 +928,11 @@ template<> size_t inline Jupiter::CString_Loose<wchar_t>::avformat(const wchar_t
Jupiter::strcpy(Jupiter::CString_Type<wchar_t>::base, Jupiter::CString_Type<wchar_t>::curr); Jupiter::strcpy(Jupiter::CString_Type<wchar_t>::base, Jupiter::CString_Type<wchar_t>::curr);
Jupiter::CString_Type<wchar_t>::curr = Jupiter::CString_Type<wchar_t>::base; Jupiter::CString_Type<wchar_t>::curr = Jupiter::CString_Type<wchar_t>::base;
} }
vswprintf(Jupiter::CString_Type<wchar_t>::curr + Jupiter::CString_Type<wchar_t>::strLen, Jupiter::CString_Loose<wchar_t>::strSize - Jupiter::CString_Type<wchar_t>::strLen, format, args); minLen = vswprintf(Jupiter::CString_Type<wchar_t>::curr + Jupiter::CString_Type<wchar_t>::strLen, Jupiter::CString_Loose<wchar_t>::strSize - Jupiter::CString_Type<wchar_t>::strLen, format, args);
Jupiter::CString_Type<wchar_t>::strLen = minLen; if (minLen <= 0) return 0;
Jupiter::CString_Type<wchar_t>::strLen += minLen;
Jupiter::CString_Type<wchar_t>::curr[Jupiter::CString_Type<wchar_t>::strLen] = 0; Jupiter::CString_Type<wchar_t>::curr[Jupiter::CString_Type<wchar_t>::strLen] = 0;
return Jupiter::CString_Type<wchar_t>::strLen; return minLen;
} }
template<typename T> size_t Jupiter::CString_Loose<T>::avformat(const T *format, va_list args) template<typename T> size_t Jupiter::CString_Loose<T>::avformat(const T *format, va_list args)

Write Preview
Loading…
Cancel
Save