Skip to content

Commit 423aeb5

Browse files
committed
Rename string formatting function into 'formatStr'
As in the Pascal version, although they are not exactly the same.
1 parent 11f5258 commit 423aeb5

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

include/tvision/util.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ ushort popupMenu(TPoint where, TMenuItem &aMenu, TGroup * = 0);
7777
Boolean lowMemory() noexcept;
7878

7979
char *newStr( TStringView ) noexcept;
80-
char *fmtStr( const char _FAR *format, ... ) noexcept;
81-
char *vFmtStr( const char _FAR *format, va_list args ) noexcept;
80+
char *formatStr( const char _FAR *format, ... ) noexcept;
81+
char *vFormatStr( const char _FAR *format, va_list args ) noexcept;
8282

8383
Boolean driveValid( char drive ) noexcept;
8484
Boolean isDir( const char *str ) noexcept;

source/tvision/fmtstr.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
/* filename - fmtstr.cpp */
33
/* */
44
/* function(s) */
5-
/* fmtStr */
6-
/* vFmtStr */
5+
/* formatStr */
6+
/* vFormatStr */
77
/*------------------------------------------------------------*/
88

99
#include <tvision/tv.h>
@@ -14,18 +14,18 @@
1414
#define va_copy(dst, src) ((void) ((dst) = (src)))
1515
#endif // __BORLANDC__
1616

17-
char *fmtStr(const char _FAR *fmt, ...) noexcept
17+
char *formatStr(const char _FAR *fmt, ...) noexcept
1818
{
1919
va_list ap;
2020

2121
va_start(ap, fmt);
22-
char *ret = vFmtStr(fmt, ap);
22+
char *ret = vFormatStr(fmt, ap);
2323
va_end(ap);
2424

2525
return ret;
2626
}
2727

28-
char *vFmtStr(const char _FAR *fmt, va_list ap) noexcept
28+
char *vFormatStr(const char _FAR *fmt, va_list ap) noexcept
2929
{
3030
va_list ap2;
3131

source/tvision/msgbox.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ ushort messageBoxRect( const TRect &r,
102102
va_list argptr;
103103

104104
va_start( argptr, fmt );
105-
char *msg = vFmtStr( fmt, argptr );
105+
char *msg = vFormatStr( fmt, argptr );
106106
va_end( argptr );
107107

108108
ushort ret = messageBoxRect( r, msg, aOptions );
@@ -134,7 +134,7 @@ ushort messageBox( unsigned aOptions, const char *fmt, ... ) noexcept
134134
va_list argptr;
135135

136136
va_start( argptr, fmt );
137-
char *msg = vFmtStr( fmt, argptr );
137+
char *msg = vFormatStr( fmt, argptr );
138138
va_end( argptr );
139139

140140
ushort ret = messageBoxRect( makeRect(msg), msg, aOptions );

0 commit comments

Comments
 (0)