Repository: trafficserver Updated Branches: refs/heads/master d23c0a28d -> 609443dbe
TS-2729: add some const qualifers to Vec and MIMEField Add some const qualifers to Vec and MIMEField. This is needed for subsequent HPACK patches. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/609443db Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/609443db Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/609443db Branch: refs/heads/master Commit: 609443dbea11ffec22d026b1bca4fcf3943470ca Parents: d23c0a2 Author: Ryo Okubo <[email protected]> Authored: Thu Oct 16 09:05:08 2014 -0700 Committer: James Peach <[email protected]> Committed: Thu Oct 16 09:05:16 2014 -0700 ---------------------------------------------------------------------- lib/ts/Vec.h | 4 ++-- proxy/hdrs/MIME.cc | 18 +++++++++--------- proxy/hdrs/MIME.h | 46 +++++++++++++++++++++++----------------------- 3 files changed, 34 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/609443db/lib/ts/Vec.h ---------------------------------------------------------------------- diff --git a/lib/ts/Vec.h b/lib/ts/Vec.h index cc233f5..47e017a 100644 --- a/lib/ts/Vec.h +++ b/lib/ts/Vec.h @@ -56,7 +56,7 @@ class Vec { C &operator[](int i) const { return v[i]; } - C get(size_t i); + C get(size_t i) const; void add(C a); void push_back(C a) { add(a); } // std::vector name bool add_exclusive(C a); @@ -184,7 +184,7 @@ Vec<C,A,S>::Vec(C c) { } template <class C, class A, int S> inline C -Vec<C,A,S>::get(size_t i) { +Vec<C,A,S>::get(size_t i) const { if (i < n && i >= 0) return v[i]; else http://git-wip-us.apache.org/repos/asf/trafficserver/blob/609443db/proxy/hdrs/MIME.cc ---------------------------------------------------------------------- diff --git a/proxy/hdrs/MIME.cc b/proxy/hdrs/MIME.cc index 2cb3122..eded04d 100644 --- a/proxy/hdrs/MIME.cc +++ b/proxy/hdrs/MIME.cc @@ -1701,7 +1701,7 @@ mime_field_destroy(MIMEHdrImpl */* mh ATS_UNUSED */, MIMEField *field) } const char * -mime_field_name_get(MIMEField *field, int *length) +mime_field_name_get(const MIMEField *field, int *length) { *length = field->m_len_name; if (field->m_wks_idx >= 0) @@ -1725,14 +1725,14 @@ mime_field_name_set(HdrHeap *heap, MIMEHdrImpl */* mh ATS_UNUSED */, MIMEField * } const char * -mime_field_value_get(MIMEField *field, int *length) +mime_field_value_get(const MIMEField *field, int *length) { *length = field->m_len_value; return field->m_ptr_value; } int32_t -mime_field_value_get_int(MIMEField *field) +mime_field_value_get_int(const MIMEField *field) { int length; const char *str = mime_field_value_get(field, &length); @@ -1741,7 +1741,7 @@ mime_field_value_get_int(MIMEField *field) } uint32_t -mime_field_value_get_uint(MIMEField *field) +mime_field_value_get_uint(const MIMEField *field) { int length; const char *str = mime_field_value_get(field, &length); @@ -1749,7 +1749,7 @@ mime_field_value_get_uint(MIMEField *field) } int64_t -mime_field_value_get_int64(MIMEField *field) +mime_field_value_get_int64(const MIMEField *field) { int length; const char *str = mime_field_value_get(field, &length); @@ -1758,7 +1758,7 @@ mime_field_value_get_int64(MIMEField *field) } time_t -mime_field_value_get_date(MIMEField *field) +mime_field_value_get_date(const MIMEField *field) { int length; const char *str = mime_field_value_get(field, &length); @@ -1766,7 +1766,7 @@ mime_field_value_get_date(MIMEField *field) } const char * -mime_field_value_get_comma_val(MIMEField *field, int *length, int idx) +mime_field_value_get_comma_val(const MIMEField *field, int *length, int idx) { // some fields (like Date) contain commas but should not be ripped apart if (!field->supports_commas()) { @@ -1791,7 +1791,7 @@ mime_field_value_get_comma_val(MIMEField *field, int *length, int idx) } int -mime_field_value_get_comma_val_count(MIMEField *field) +mime_field_value_get_comma_val_count(const MIMEField *field) { // some fields (like Date) contain commas but should not be ripped apart if (!field->supports_commas()) { @@ -1804,7 +1804,7 @@ mime_field_value_get_comma_val_count(MIMEField *field) } int -mime_field_value_get_comma_list(MIMEField *field, StrList *list) +mime_field_value_get_comma_list(const MIMEField *field, StrList *list) { const char *str; int len; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/609443db/proxy/hdrs/MIME.h ---------------------------------------------------------------------- diff --git a/proxy/hdrs/MIME.h b/proxy/hdrs/MIME.h index 6177cf3..1973a9a 100644 --- a/proxy/hdrs/MIME.h +++ b/proxy/hdrs/MIME.h @@ -133,14 +133,14 @@ struct MIMEField return true; // by default, assume supports commas } - const char *name_get(int *length); + const char *name_get(int *length) const; - const char *value_get(int *length); - int32_t value_get_int(); - uint32_t value_get_uint(); - int64_t value_get_int64(); - time_t value_get_date(); - int value_get_comma_list(StrList * list); + const char *value_get(int *length) const; + int32_t value_get_int() const; + uint32_t value_get_uint() const; + int64_t value_get_int64() const; + time_t value_get_date() const; + int value_get_comma_list(StrList * list) const; void name_set(HdrHeap * heap, MIMEHdrImpl * mh, const char *name, int length); @@ -637,18 +637,18 @@ inkcoreapi MIMEField *mime_hdr_prepare_for_value_set(HdrHeap * heap, MIMEHdrImpl void mime_field_destroy(MIMEHdrImpl * mh, MIMEField * field); -const char *mime_field_name_get(MIMEField * field, int *length); +const char *mime_field_name_get(const MIMEField * field, int *length); void mime_field_name_set(HdrHeap * heap, MIMEHdrImpl * mh, MIMEField * field, int16_t name_wks_idx_or_neg1, const char *name, int length, bool must_copy_string); -inkcoreapi const char *mime_field_value_get(MIMEField * field, int *length); -int32_t mime_field_value_get_int(MIMEField * field); -uint32_t mime_field_value_get_uint(MIMEField * field); -int64_t mime_field_value_get_int64(MIMEField * field); -time_t mime_field_value_get_date(MIMEField * field); -const char *mime_field_value_get_comma_val(MIMEField * field, int *length, int idx); -int mime_field_value_get_comma_val_count(MIMEField * field); -int mime_field_value_get_comma_list(MIMEField * field, StrList * list); +inkcoreapi const char *mime_field_value_get(const MIMEField * field, int *length); +int32_t mime_field_value_get_int(const MIMEField * field); +uint32_t mime_field_value_get_uint(const MIMEField * field); +int64_t mime_field_value_get_int64(const MIMEField * field); +time_t mime_field_value_get_date(const MIMEField * field); +const char *mime_field_value_get_comma_val(const MIMEField * field, int *length, int idx); +int mime_field_value_get_comma_val_count(const MIMEField * field); +int mime_field_value_get_comma_list(const MIMEField * field, StrList * list); void mime_field_value_set_comma_val(HdrHeap * heap, MIMEHdrImpl * mh, MIMEField * field, int idx, const char *new_piece_str, int new_piece_len); @@ -729,7 +729,7 @@ int mime_parse_integer(const char *&buf, const char *end, int *integer); -------------------------------------------------------------------------*/ inline const char * -MIMEField::name_get(int *length) +MIMEField::name_get(int *length) const { return (mime_field_name_get(this, length)); } @@ -756,37 +756,37 @@ MIMEField::name_set(HdrHeap * heap, MIMEHdrImpl * mh, const char *name, int leng -------------------------------------------------------------------------*/ inline const char * -MIMEField::value_get(int *length) +MIMEField::value_get(int *length) const { return (mime_field_value_get(this, length)); } inline int32_t -MIMEField::value_get_int() +MIMEField::value_get_int() const { return (mime_field_value_get_int(this)); } inline uint32_t -MIMEField::value_get_uint() +MIMEField::value_get_uint() const { return (mime_field_value_get_uint(this)); } inline int64_t -MIMEField::value_get_int64() +MIMEField::value_get_int64() const { return (mime_field_value_get_int64(this)); } inline time_t -MIMEField::value_get_date() +MIMEField::value_get_date() const { return (mime_field_value_get_date(this)); } inline int -MIMEField::value_get_comma_list(StrList * list) +MIMEField::value_get_comma_list(StrList * list) const { return (mime_field_value_get_comma_list(this, list)); }
