Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
c9f729ea
Commit
c9f729ea
authored
Apr 09, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "win32: fix %zu fixups - dont use mingw's vsnprintf"
This reverts commit
151982aa
.
parent
45b0f5c6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
11 deletions
+5
-11
include/vlc_fixups.h
include/vlc_fixups.h
+5
-11
No files found.
include/vlc_fixups.h
View file @
c9f729ea
...
@@ -124,11 +124,7 @@ static inline int vlc_vsprintf (char *str, const char *format, va_list ap)
...
@@ -124,11 +124,7 @@ static inline int vlc_vsprintf (char *str, const char *format, va_list ap)
static
inline
int
vlc_vsnprintf
(
char
*
str
,
size_t
size
,
const
char
*
format
,
va_list
ap
)
static
inline
int
vlc_vsnprintf
(
char
*
str
,
size_t
size
,
const
char
*
format
,
va_list
ap
)
{
{
char
*
fmt
=
vlc_fix_format_string
(
format
);
char
*
fmt
=
vlc_fix_format_string
(
format
);
/* traditionally, MSVCRT has provided vsnprintf as _vsnprintf;
int
ret
=
vsnprintf
(
str
,
size
,
fmt
?
fmt
:
format
,
ap
);
* to 'aid' portability/standards compliance, mingw provides a
* static version of vsnprintf that is buggy. Be sure to use
* MSVCRT version, at least it behaves as expected */
int
ret
=
_vsnprintf
(
str
,
size
,
fmt
?
fmt
:
format
,
ap
);
free
(
fmt
);
free
(
fmt
);
return
ret
;
return
ret
;
}
}
...
@@ -139,7 +135,7 @@ static inline int vlc_printf (const char *format, ...)
...
@@ -139,7 +135,7 @@ static inline int vlc_printf (const char *format, ...)
va_list
ap
;
va_list
ap
;
int
ret
;
int
ret
;
va_start
(
ap
,
format
);
va_start
(
ap
,
format
);
ret
=
v
lc_v
printf
(
format
,
ap
);
ret
=
vprintf
(
format
,
ap
);
va_end
(
ap
);
va_end
(
ap
);
return
ret
;
return
ret
;
}
}
...
@@ -150,7 +146,7 @@ static inline int vlc_fprintf (FILE *stream, const char *format, ...)
...
@@ -150,7 +146,7 @@ static inline int vlc_fprintf (FILE *stream, const char *format, ...)
va_list
ap
;
va_list
ap
;
int
ret
;
int
ret
;
va_start
(
ap
,
format
);
va_start
(
ap
,
format
);
ret
=
v
lc_v
fprintf
(
stream
,
format
,
ap
);
ret
=
vfprintf
(
stream
,
format
,
ap
);
va_end
(
ap
);
va_end
(
ap
);
return
ret
;
return
ret
;
}
}
...
@@ -162,7 +158,7 @@ static inline int vlc_sprintf (char *str, const char *format, ...)
...
@@ -162,7 +158,7 @@ static inline int vlc_sprintf (char *str, const char *format, ...)
va_list ap;
va_list ap;
int ret;
int ret;
va_start (ap, format);
va_start (ap, format);
ret = v
lc_v
sprintf (str, format, ap);
ret = vsprintf (str, format, ap);
va_end (ap);
va_end (ap);
return ret;
return ret;
}
}
...
@@ -174,12 +170,10 @@ static inline int vlc_snprintf (char *str, size_t size, const char *format, ...)
...
@@ -174,12 +170,10 @@ static inline int vlc_snprintf (char *str, size_t size, const char *format, ...)
va_list
ap
;
va_list
ap
;
int
ret
;
int
ret
;
va_start
(
ap
,
format
);
va_start
(
ap
,
format
);
ret
=
v
lc_v
snprintf
(
str
,
size
,
format
,
ap
);
ret
=
vsnprintf
(
str
,
size
,
format
,
ap
);
va_end
(
ap
);
va_end
(
ap
);
return
ret
;
return
ret
;
}
}
/* win32: snprintf must always be vlc_snprintf or _snprintf,
* see comment in vlc_vsnprintf */
# define snprintf vlc_snprintf
# define snprintf vlc_snprintf
/* Make sure we don't use flawed vasprintf or asprintf either */
/* Make sure we don't use flawed vasprintf or asprintf either */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment