oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Add rtbl_add_column_entryv functions, printf like

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17758 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-06-30 13:41:40 +00:00
parent cb915dd449
commit f4e84f2cac
2 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/roken/rtbl.c
View File

@@ -314,6 +314,24 @@ rtbl_add_column_entry_by_id (rtbl_t table, unsigned int id, const char *data)
return add_column_entry(c, data); return add_column_entry(c, data);
} }
int ROKEN_LIB_FUNCTION
rtbl_add_column_entryv_by_id (rtbl_t table, unsigned int id,
const char *fmt, ...)
{
va_list ap;
char *str;
int ret;
va_start(ap, fmt);
ret = vasprintf(&str, fmt, ap);
va_end(ap);
if (ret == -1)
return -1;
ret = rtbl_add_column_entry_by_id(table, id, str);
free(str);
return ret;
}
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
rtbl_add_column_entry (rtbl_t table, const char *column, const char *data) rtbl_add_column_entry (rtbl_t table, const char *column, const char *data)
{ {
@@ -325,6 +343,24 @@ rtbl_add_column_entry (rtbl_t table, const char *column, const char *data)
return add_column_entry(c, data); return add_column_entry(c, data);
} }
int ROKEN_LIB_FUNCTION
rtbl_add_column_entryv (rtbl_t table, const char *column, const char *fmt, ...)
{
va_list ap;
char *str;
int ret;
va_start(ap, fmt);
ret = vasprintf(&str, fmt, ap);
va_end(ap);
if (ret == -1)
return -1;
ret = rtbl_add_column_entry(table, column, str);
free(str);
return ret;
}
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
rtbl_format (rtbl_t table, FILE * f) rtbl_format (rtbl_t table, FILE * f)
{ {

13
lib/roken/rtbl.h
View File

@@ -43,6 +43,10 @@
#endif #endif
#endif #endif
#if !defined(__GNUC__) && !defined(__attribute__)
#define __attribute__(x)
#endif
struct rtbl_data; struct rtbl_data;
typedef struct rtbl_data *rtbl_t; typedef struct rtbl_data *rtbl_t;
@@ -58,9 +62,18 @@ rtbl_add_column (rtbl_t, const char*, unsigned int);
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
rtbl_add_column_by_id (rtbl_t, unsigned int, const char*, unsigned int); rtbl_add_column_by_id (rtbl_t, unsigned int, const char*, unsigned int);
int ROKEN_LIB_FUNCTION
rtbl_add_column_entryv_by_id (rtbl_t table, unsigned int id,
const char *fmt, ...)
__attribute__ ((format (printf, 3, 0)));
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
rtbl_add_column_entry (rtbl_t, const char*, const char*); rtbl_add_column_entry (rtbl_t, const char*, const char*);
int ROKEN_LIB_FUNCTION
rtbl_add_column_entryv (rtbl_t, const char*, const char*, ...)
__attribute__ ((format (printf, 3, 0)));
int ROKEN_LIB_FUNCTION int ROKEN_LIB_FUNCTION
rtbl_add_column_entry_by_id (rtbl_t, unsigned int, const char*); rtbl_add_column_entry_by_id (rtbl_t, unsigned int, const char*);