X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fdynamic-string.h;h=db033c98452f1680877fd82bd449cb8789e3091d;hb=55eccb868b8f1da858a9f724335b5bb059276497;hp=dc81fb3a76584da668ab5c04af5fdab4e7dfd84c;hpb=5f98eed4eb5b75ab02422de1b5dbd5276ad5593d;p=openvswitch diff --git a/lib/dynamic-string.h b/lib/dynamic-string.h index dc81fb3a..db033c98 100644 --- a/lib/dynamic-string.h +++ b/lib/dynamic-string.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010 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); @@ -59,8 +59,24 @@ char *ds_cstr(struct ds *); const char *ds_cstr_ro(const struct ds *); char *ds_steal_cstr(struct ds *); void ds_destroy(struct ds *); +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 */