X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdynamic-string.h;h=2961a013742998c04c5fbd586e05d16c416bf4c9;hb=0f50458b0a3054566c4f5cd70e0bc92ca7dafe49;hp=eebbdbfe872b36c9e0603ae77bcfcaa204bf7b5c;hpb=a4af00400a835eb87569ba40e21874c05e872c0f;p=sliver-openvswitch.git diff --git a/lib/dynamic-string.h b/lib/dynamic-string.h index eebbdbfe8..2961a0137 100644 --- a/lib/dynamic-string.h +++ b/lib/dynamic-string.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ void ds_clear(struct ds *); void ds_truncate(struct ds *, size_t new_length); void ds_reserve(struct ds *, size_t min_length); char *ds_put_uninit(struct ds *, size_t n); -void ds_put_char(struct ds *, char); +static inline void ds_put_char(struct ds *, char); void ds_put_utf8(struct ds *, int uc); void ds_put_char_multiple(struct ds *, char, size_t n); void ds_put_buffer(struct ds *, const char *, size_t n); @@ -54,6 +54,7 @@ void ds_put_strftime(struct ds *, const char *, const struct tm *) void ds_put_hex_dump(struct ds *ds, const void *buf_, size_t size, uintptr_t ofs, bool ascii); int ds_get_line(struct ds *, FILE *); +int ds_get_preprocessed_line(struct ds *, FILE *); char *ds_cstr(struct ds *); const char *ds_cstr_ro(const struct ds *); @@ -63,5 +64,20 @@ void ds_swap(struct ds *, struct ds *); int ds_last(const struct ds *); void ds_chomp(struct ds *, int c); + +/* Inline functions. */ + +void ds_put_char__(struct ds *, char); + +static inline void +ds_put_char(struct ds *ds, char c) +{ + if (ds->length < ds->allocated) { + ds->string[ds->length++] = c; + ds->string[ds->length] = '\0'; + } else { + ds_put_char__(ds, c); + } +} #endif /* dynamic-string.h */