Simplify the use of return values from Wels*Snprintf

Also similarly simplify the use of the return value from WelsStrftime and GetCodeName/GetLibName/GetVerNum.

Martin Storsjö committed 12 years ago

Commit c4e1d2b1 parent 564d16c3 files · +32 −64Browse files

Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 3 files). Show all

Unified · Split

codec/encoder/plus/src/welsEncoderExt.cpp+8−16

@@ -90,20 +90,16 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 89 unmodified lines
90	90	iCurUsedSize = WelsSnprintf (strLenFileName, iBufferLeftSize, "enc_size_0x%p_", (void*)this);
91	91
92	92
93		− if (iCurUsed > 0) {
94		− iBufferUsed += iCurUsed;
95		− iBufferLeft -= iCurUsed;
96		− }
	93	+ iBufferUsed += iCurUsed;
	94	+ iBufferLeft -= iCurUsed;
97	95	if (iBufferLeft > 0) {
98	96	iCurUsed = WelsStrftime (&strStreamFileName[iBufferUsed], iBufferLeft, "%y%m%d%H%M%S", &tTime);
99	97	iBufferUsed += iCurUsed;
100	98	iBufferLeft -= iCurUsed;
101	99	}
102	100
103		− if (iCurUsedSize > 0) {
104		− iBufferUsedSize += iCurUsedSize;
105		− iBufferLeftSize -= iCurUsedSize;
106		− }
	101	+ iBufferUsedSize += iCurUsedSize;
	102	+ iBufferLeftSize -= iCurUsedSize;
107	103	if (iBufferLeftSize > 0) {
108	104	iCurUsedSize = WelsStrftime (&strLenFileName[iBufferUsedSize], iBufferLeftSize, "%y%m%d%H%M%S", &tTime);
109	105	iBufferUsedSize += iCurUsedSize;
@@ -113,19 +109,15 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 3 unmodified lines
113	109	if (iBufferLeft > 0) {
114	110	iCurUsed = WelsSnprintf (&strStreamFileName[iBufferUsed], iBufferLeft, ".%03.3u.264",
115	111	WelsGetMillisecond(&tTime));
116		− if (iCurUsed > 0) {
117		− iBufferUsed += iCurUsed;
118		− iBufferLeft -= iCurUsed;
119		− }
	112	+ iBufferUsed += iCurUsed;
	113	+ iBufferLeft -= iCurUsed;
120	114	}
121	115
122	116	if (iBufferLeftSize > 0) {
123	117	iCurUsedSize = WelsSnprintf (&strLenFileName[iBufferUsedSize], iBufferLeftSize, ".%03.3u.len",
124	118	WelsGetMillisecond(&tTime));
125		− if (iCurUsedSize > 0) {
126		− iBufferUsedSize += iCurUsedSize;
127		− iBufferLeftSize -= iCurUsedSize;
128		− }
	119	+ iBufferUsedSize += iCurUsedSize;
	120	+ iBufferLeftSize -= iCurUsedSize;
129	121	}
130	122
131	123	m_pFileBs = WelsFopen (strStreamFileName, "wb");

Simplify the use of return values from Wels*Snprintf

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code