Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
postgres-lambda-diff
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jakob Huber
postgres-lambda-diff
Commits
cac18a76
Commit
cac18a76
authored
10 years ago
by
Noah Misch
Browse files
Options
Downloads
Patches
Plain Diff
Permit use of vsprintf() in PostgreSQL code.
The next commit needs it. Back-patch to 9.0 (all supported versions).
parent
b0ce3850
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/include/port.h
+6
-0
6 additions, 0 deletions
src/include/port.h
src/port/snprintf.c
+2
-1
2 additions, 1 deletion
src/port/snprintf.c
with
8 additions
and
1 deletion
src/include/port.h
+
6
−
0
View file @
cac18a76
...
...
@@ -139,6 +139,9 @@ extern unsigned char pg_ascii_tolower(unsigned char ch);
#ifdef snprintf
#undef snprintf
#endif
#ifdef vsprintf
#undef vsprintf
#endif
#ifdef sprintf
#undef sprintf
#endif
...
...
@@ -154,6 +157,7 @@ extern unsigned char pg_ascii_tolower(unsigned char ch);
extern
int
pg_vsnprintf
(
char
*
str
,
size_t
count
,
const
char
*
fmt
,
va_list
args
);
extern
int
pg_snprintf
(
char
*
str
,
size_t
count
,
const
char
*
fmt
,...)
pg_attribute_printf
(
3
,
4
);
extern
int
pg_vsprintf
(
char
*
str
,
const
char
*
fmt
,
va_list
args
);
extern
int
pg_sprintf
(
char
*
str
,
const
char
*
fmt
,...)
pg_attribute_printf
(
2
,
3
);
extern
int
pg_vfprintf
(
FILE
*
stream
,
const
char
*
fmt
,
va_list
args
);
extern
int
pg_fprintf
(
FILE
*
stream
,
const
char
*
fmt
,...)
pg_attribute_printf
(
2
,
3
);
...
...
@@ -167,6 +171,7 @@ extern int pg_printf(const char *fmt,...) pg_attribute_printf(1, 2);
#ifdef __GNUC__
#define vsnprintf(...) pg_vsnprintf(__VA_ARGS__)
#define snprintf(...) pg_snprintf(__VA_ARGS__)
#define vsprintf(...) pg_vsprintf(__VA_ARGS__)
#define sprintf(...) pg_sprintf(__VA_ARGS__)
#define vfprintf(...) pg_vfprintf(__VA_ARGS__)
#define fprintf(...) pg_fprintf(__VA_ARGS__)
...
...
@@ -174,6 +179,7 @@ extern int pg_printf(const char *fmt,...) pg_attribute_printf(1, 2);
#else
#define vsnprintf pg_vsnprintf
#define snprintf pg_snprintf
#define vsprintf pg_vsprintf
#define sprintf pg_sprintf
#define vfprintf pg_vfprintf
#define fprintf pg_fprintf
...
...
This diff is collapsed.
Click to expand it.
src/port/snprintf.c
+
2
−
1
View file @
cac18a76
...
...
@@ -99,6 +99,7 @@
/* Prevent recursion */
#undef vsnprintf
#undef snprintf
#undef vsprintf
#undef sprintf
#undef vfprintf
#undef fprintf
...
...
@@ -178,7 +179,7 @@ pg_snprintf(char *str, size_t count, const char *fmt,...)
return
len
;
}
static
int
int
pg_vsprintf
(
char
*
str
,
const
char
*
fmt
,
va_list
args
)
{
PrintfTarget
target
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment