projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify last commit.
[gnulib.git]
/
lib
/
printf-parse.h
diff --git
a/lib/printf-parse.h
b/lib/printf-parse.h
index
eb5480b
..
d253e6e
100644
(file)
--- a/
lib/printf-parse.h
+++ b/
lib/printf-parse.h
@@
-1,5
+1,5
@@
/* Parse printf format string.
/* Parse printf format string.
- Copyright (C) 1999, 2002-2003, 2005, 2007, 20
09-2010
Free Software
+ Copyright (C) 1999, 2002-2003, 2005, 2007, 20
10-2012
Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@
-13,8
+13,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ with this program; if not, see <http://www.gnu.org/licenses/>. */
#ifndef _PRINTF_PARSE_H
#define _PRINTF_PARSE_H
#ifndef _PRINTF_PARSE_H
#define _PRINTF_PARSE_H
@@
-47,6
+46,9
@@
/* xxx_directive: A parsed directive.
xxx_directives: A parsed format string. */
/* xxx_directive: A parsed directive.
xxx_directives: A parsed format string. */
+/* Number of directly allocated directives (no malloc() needed). */
+#define N_DIRECT_ALLOC_DIRECTIVES 7
+
/* A parsed directive. */
typedef struct
{
/* A parsed directive. */
typedef struct
{
@@
-71,6
+73,7
@@
typedef struct
char_directive *dir;
size_t max_width_length;
size_t max_precision_length;
char_directive *dir;
size_t max_width_length;
size_t max_precision_length;
+ char_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES];
}
char_directives;
}
char_directives;
@@
-100,6
+103,7
@@
typedef struct
u8_directive *dir;
size_t max_width_length;
size_t max_precision_length;
u8_directive *dir;
size_t max_width_length;
size_t max_precision_length;
+ u8_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES];
}
u8_directives;
}
u8_directives;
@@
-127,6
+131,7
@@
typedef struct
u16_directive *dir;
size_t max_width_length;
size_t max_precision_length;
u16_directive *dir;
size_t max_width_length;
size_t max_precision_length;
+ u16_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES];
}
u16_directives;
}
u16_directives;
@@
-154,6
+159,7
@@
typedef struct
u32_directive *dir;
size_t max_width_length;
size_t max_precision_length;
u32_directive *dir;
size_t max_width_length;
size_t max_precision_length;
+ u32_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES];
}
u32_directives;
}
u32_directives;