You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/06/29 23:10:17 UTC
svn commit: r959101 - in /trafficserver/traffic/trunk/proxy: InkAPI.cc
InkAPITest.cc api/ts/ts.h
Author: zwoop
Date: Tue Jun 29 21:10:17 2010
New Revision: 959101
URL: http://svn.apache.org/viewvc?rev=959101&view=rev
Log:
TS-266: Mark all deprecated APIs as deprecated.
Tested: Fedora Core 13
Modified:
trafficserver/traffic/trunk/proxy/InkAPI.cc
trafficserver/traffic/trunk/proxy/InkAPITest.cc
trafficserver/traffic/trunk/proxy/api/ts/ts.h
Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=959101&r1=959100&r2=959101&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Tue Jun 29 21:10:17 2010
@@ -23,6 +23,9 @@
#ifndef INK_NO_API
+// Avoid complaining about the deprecated APIs.
+#define INK_DEPRECATED
+
#include "inktomi++.h"
#include "I_Layout.h"
@@ -62,6 +65,7 @@
#include "HttpDebugNames.h"
#include "I_AIO.h"
+
/****************************************************************
* IMPORTANT - READ ME
* Any plugin using the IO Core must enter
Modified: trafficserver/traffic/trunk/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPITest.cc?rev=959101&r1=959100&r2=959101&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPITest.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPITest.cc Tue Jun 29 21:10:17 2010
@@ -1297,8 +1297,10 @@ REGRESSION_TEST(SDK_API_INKContCreate) (
INKMutex mutexp = INKMutexCreate();
INKCont contp = INKContCreate(cont_handler, mutexp);
+ int lock = 0;
- if (INKMutexTryLock(mutexp) == 1) //mutex is grabbed
+ INKMutexLockTry(mutexp, &lock);
+ if (lock) //mutex is grabbed
{
INKContCall(contp, (INKEvent) 0, NULL);
INKMutexUnlock(mutexp);
@@ -1482,18 +1484,20 @@ REGRESSION_TEST(SDK_API_INKMutexCreate)
INKMutexLock(mutexp);
/* This is normal because all locking is from the same thread */
- int lock = INKMutexTryLock(mutexp);
- lock = INKMutexTryLock(mutexp);
+ int lock = 0;
+
+ INKMutexLockTry(mutexp, &lock);
+ INKMutexLockTry(mutexp, &lock);
if (lock) {
SDK_RPRINT(test, "INKMutexCreate", "TestCase1", TC_PASS, "ok");
SDK_RPRINT(test, "INKMutexLock", "TestCase1", TC_PASS, "ok");
- SDK_RPRINT(test, "INKMutexTryLock", "TestCase1", TC_PASS, "ok");
+ SDK_RPRINT(test, "INKMutexLockTry", "TestCase1", TC_PASS, "ok");
test_passed = true;
} else {
SDK_RPRINT(test, "INKMutexCreate", "TestCase1", TC_FAIL, "mutex can't be grabbed twice from the same thread");
SDK_RPRINT(test, "INKMutexLock", "TestCase1", TC_FAIL, "mutex can't be grabbed twice from the same thread");
- SDK_RPRINT(test, "INKMutexTryLock", "TestCase1", TC_FAIL, "mutex can't be grabbed twice from the same thread");
+ SDK_RPRINT(test, "INKMutexLockTry", "TestCase1", TC_FAIL, "mutex can't be grabbed twice from the same thread");
}
@@ -1740,14 +1744,14 @@ REGRESSION_TEST(SDK_API_INKIOBufferBlock
int i = 10000;
INKIOBuffer bufp = INKIOBufferCreate();
- INKIOBufferData datap = INKIOBufferDataCreate(&i, sizeof(int), INK_DATA_CONSTANT);
- INKIOBufferBlock blockp = INKIOBufferBlockCreate(datap, sizeof(int), 0);
- INKIOBufferAppend(bufp, blockp);
-
+ INKIOBufferWrite(bufp, (char*)&i, sizeof(int));
INKIOBufferReader readerp = INKIOBufferReaderAlloc(bufp);
int avail_write, avail_read;
+ // TODO: This is probably not correct any more.
+ INKIOBufferBlock blockp = INKIOBufferStart(bufp);
+
if ((INKIOBufferBlockWriteStart(blockp, &avail_write) - INKIOBufferBlockReadStart(blockp, readerp, &avail_read)) ==
sizeof(int)) {
SDK_RPRINT(test, "INKIOBufferBlockReadStart", "TestCase1", TC_PASS, "ok");
@@ -1758,7 +1762,7 @@ REGRESSION_TEST(SDK_API_INKIOBufferBlock
SDK_RPRINT(test, "INKIOBufferBlockWriteStart", "TestCase1", TC_FAIL, "failed");
}
- if ((INKIOBufferBlockReadAvail(blockp, readerp) - INKIOBufferBlockWriteAvail(blockp)) == sizeof(int)) {
+ if ((INKIOBufferBlockReadAvail(blockp, readerp) + INKIOBufferBlockWriteAvail(blockp)) == 4096) {
SDK_RPRINT(test, "INKIOBufferBlockReadAvail", "TestCase1", TC_PASS, "ok");
SDK_RPRINT(test, "INKIOBufferBlockWriteAvail", "TestCase1", TC_PASS, "ok");
test_passed_2 = true;
@@ -1788,16 +1792,14 @@ REGRESSION_TEST(SDK_API_INKIOBufferBlock
int i = 10000;
INKIOBuffer bufp = INKIOBufferCreate();
- INKIOBufferData datap = INKIOBufferDataCreate(&i, sizeof(int), INK_DATA_CONSTANT);
- INKIOBufferBlock blockp = INKIOBufferBlockCreate(datap, sizeof(int), 0);
- INKIOBufferAppend(bufp, blockp);
-
- // The first block (BUFFER_FOR_CONSTAN is "full", so that
- // a new block is added to the full block and now the start pointer
- // of the IOBuffer is this new block.
- INKIOBufferBlock blockp_next = INKIOBufferStart(bufp);
+ INKIOBufferWrite(bufp, (char*)&i, sizeof(int));
- if (INKIOBufferBlockNext(blockp) == blockp_next) {
+ INKIOBufferReader readerp = INKIOBufferReaderAlloc(bufp);
+ INKIOBufferBlock blockp = INKIOBufferReaderStart(readerp);
+
+ // TODO: This is probaby not the best of regression tests right now ...
+ // Note that this assumes block size is > sizeof(int) bytes.
+ if (INKIOBufferBlockNext(blockp) == NULL) {
SDK_RPRINT(test, "INKIOBufferBlockNext", "TestCase1", TC_PASS, "ok");
test_passed = true;
} else {
@@ -1832,7 +1834,9 @@ REGRESSION_TEST(SDK_API_INKStatIntSet) (
INKStat stat = INKStatCreate("stat_is", INKSTAT_TYPE_INT64);
INKStatIntSet(stat, 100);
- INK64 stat_val = INKStatIntRead(stat);
+ INK64 stat_val;
+
+ INKStatIntGet(stat, &stat_val);
if (stat_val == 100) {
SDK_RPRINT(test, "INKStatIntSet", "TestCase1", TC_PASS, "ok");
@@ -1859,7 +1863,9 @@ REGRESSION_TEST(SDK_API_INKStatIntAddTo)
INKStat stat = INKStatCreate("stat_ia", INKSTAT_TYPE_INT64);
INKStatIntAddTo(stat, 100);
- INK64 stat_val = INKStatIntRead(stat);
+ INK64 stat_val;
+
+ INKStatIntGet(stat, &stat_val);
if (stat_val == 100) {
SDK_RPRINT(test, "INKStatIntAddTo", "TestCase1", TC_PASS, "ok");
@@ -1887,7 +1893,8 @@ REGRESSION_TEST(SDK_API_INKStatFloatAddT
INKStat stat = INKStatCreate("stat_fa", INKSTAT_TYPE_FLOAT);
INKStatFloatAddTo(stat, 100.0);
- float stat_val = INKStatFloatRead(stat);
+ float stat_val;
+ INKStatFloatGet(stat, &stat_val);
if (stat_val == 100.0) {
SDK_RPRINT(test, "INKStatFloatAddTo", "TestCase1", TC_PASS, "ok");
@@ -1914,7 +1921,8 @@ REGRESSION_TEST(SDK_API_INKStatFloatSet)
INKStat stat = INKStatCreate("stat_fs", INKSTAT_TYPE_FLOAT);
INKStatFloatSet(stat, 100.0);
- float stat_val = INKStatFloatRead(stat);
+ float stat_val;
+ INKStatFloatGet(stat, &stat_val);
if (stat_val == 100.0) {
SDK_RPRINT(test, "INKStatFloatSet", "TestCase1", TC_PASS, "ok");
@@ -1946,7 +1954,8 @@ REGRESSION_TEST(SDK_API_INKStatIncrement
INKStat stat_2 = INKStatCreate("stat_2", INKSTAT_TYPE_FLOAT);
INKStatIncrement(stat_1);
- INK64 stat1_val = INKStatIntRead(stat_1);
+ INK64 stat1_val;
+ INKStatIntGet(stat_1, &stat1_val);
if (stat1_val == 1) {
SDK_RPRINT(test, "INKStatIncrement", "TestCase1", TC_PASS, "ok for int stat");
@@ -1956,7 +1965,7 @@ REGRESSION_TEST(SDK_API_INKStatIncrement
}
INKStatDecrement(stat_1);
- stat1_val = INKStatIntRead(stat_1);
+ INKStatIntGet(stat_1, &stat1_val);
if (stat1_val == 0) {
SDK_RPRINT(test, "INKStatDecrement", "TestCase1", TC_PASS, "ok for int stat");
@@ -1966,7 +1975,8 @@ REGRESSION_TEST(SDK_API_INKStatIncrement
}
INKStatIncrement(stat_2);
- float stat2_val = INKStatFloatRead(stat_2);
+ float stat2_val;
+ INKStatFloatGet(stat_2, &stat2_val);
if (stat2_val == 1.0) {
SDK_RPRINT(test, "INKStatIncrement", "TestCase2", TC_PASS, "ok for float stat");
@@ -1978,7 +1988,7 @@ REGRESSION_TEST(SDK_API_INKStatIncrement
}
INKStatDecrement(stat_2);
- stat2_val = INKStatFloatRead(stat_2);
+ INKStatFloatGet(stat_2, &stat2_val);
if (stat2_val == 0.0) {
SDK_RPRINT(test, "INKStatDecrement", "TestCase2", TC_PASS, "ok for float stat");
@@ -2043,19 +2053,25 @@ REGRESSION_TEST(SDK_API_INKStatCoupled)
/* stat operation */
INKStatIntSet(local_stat_1, 100);
INKStatIntSet(local_stat_2, 100);
- float local_val_1 = (float) INKStatIntRead(local_stat_1);
- float local_val_2 = (float) INKStatIntRead(local_stat_2);
+ float local_val_1;
+ INKStatFloatGet(local_stat_1, &local_val_1);
+ float local_val_2;
+ INKStatFloatGet(local_stat_2, &local_val_2);
INKStatFloatAddTo(local_stat_sum, local_val_1);
INKStatFloatAddTo(local_stat_sum, local_val_2);
- float local_val_sum = INKStatFloatRead(local_stat_sum);
+ float local_val_sum;
+ INKStatFloatGet(local_stat_sum, &local_val_sum);
INKStatsCoupledUpdate(stat_local_copy);
INKStatCoupledLocalCopyDestroy(stat_local_copy);
- float global_val_sum = INKStatFloatRead(global_stat_sum);
- INK64 global_val_1 = INKStatIntRead(global_stat_1);
- INK64 global_val_2 = INKStatIntRead(global_stat_2);
+ float global_val_sum;
+ INKStatFloatGet(global_stat_sum, &global_val_sum);
+ INK64 global_val_1;
+ INKStatIntGet(global_stat_1, &global_val_1);
+ INK64 global_val_2;
+ INKStatIntGet(global_stat_2, &global_val_2);
if (local_val_1 == global_val_1 && local_val_2 == global_val_2 && local_val_sum == global_val_sum) {
SDK_RPRINT(test, "INKStatCoupledGlobalCategoryCreate", "TestCase1", TC_PASS, "ok");
Modified: trafficserver/traffic/trunk/proxy/api/ts/ts.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/ts.h?rev=959101&r1=959100&r2=959101&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts.h (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts.h Tue Jun 29 21:10:17 2010
@@ -52,6 +52,14 @@ extern "C"
#define INK_RES_MEM_PATH INK_RES_PATH ("memory/")
#define INK_MAX_USER_NAME_LEN 256
+#if __GNUC__ >= 3
+#ifndef INK_DEPRECATED
+#define INK_DEPRECATED __attribute__ ((deprecated))
+#endif
+#else
+#define INK_DEPRECATED
+#endif
+
/**
The following struct is used by INKPluginRegister(). It stores
registration information about the plugin.
@@ -1843,7 +1851,7 @@ extern "C"
inkapi INKReturnCode INKMutexLockTry(INKMutex mutexp, int *lock);
/** @deprecated */
- inkapi int INKMutexTryLock(INKMutex mutexp);
+ inkapi INK_DEPRECATED int INKMutexTryLock(INKMutex mutexp);
inkapi INKReturnCode INKMutexUnlock(INKMutex mutexp);
@@ -2415,10 +2423,10 @@ extern "C"
inkapi INKReturnCode INKStatFloatGet(INKStat the_stat, float *value);
/** @deprecated */
- inkapi INK64 INKStatIntRead(INKStat the_stat);
+ inkapi INK_DEPRECATED INK64 INKStatIntRead(INKStat the_stat);
/** @deprecated */
- inkapi float INKStatFloatRead(INKStat the_stat);
+ inkapi INK_DEPRECATED float INKStatFloatRead(INKStat the_stat);
inkapi INKReturnCode INKStatIntSet(INKStat the_stat, INK64 value);
inkapi INKReturnCode INKStatFloatSet(INKStat the_stat, float value);
@@ -2676,191 +2684,191 @@ extern "C"
Deprecated Buffer Functions */
/** @deprecated */
- inkapi INKReturnCode INKIOBufferAppend(INKIOBuffer bufp, INKIOBufferBlock blockp);
+ inkapi INK_DEPRECATED INKReturnCode INKIOBufferAppend(INKIOBuffer bufp, INKIOBufferBlock blockp);
/** @deprecated */
- inkapi INKIOBufferData INKIOBufferDataCreate(void *data, int size, INKIOBufferDataFlags flags);
+ inkapi INK_DEPRECATED INKIOBufferData INKIOBufferDataCreate(void *data, int size, INKIOBufferDataFlags flags);
/** @deprecated */
- inkapi INKIOBufferBlock INKIOBufferBlockCreate(INKIOBufferData datap, int size, int offset);
+ inkapi INK_DEPRECATED INKIOBufferBlock INKIOBufferBlockCreate(INKIOBufferData datap, int size, int offset);
/* --------------------------------------------------------------------------
Deprecated MBuffer functions */
/** @deprecated */
- inkapi int INKMBufferDataSet(INKMBuffer bufp, void *data);
+ inkapi INK_DEPRECATED int INKMBufferDataSet(INKMBuffer bufp, void *data);
/** @deprecated */
- inkapi void *INKMBufferDataGet(INKMBuffer bufp, int *length);
+ inkapi INK_DEPRECATED void *INKMBufferDataGet(INKMBuffer bufp, int *length);
/** @deprecated */
- inkapi int INKMBufferLengthGet(INKMBuffer bufp);
+ inkapi INK_DEPRECATED int INKMBufferLengthGet(INKMBuffer bufp);
/** @deprecated */
- inkapi void INKMBufferRef(INKMBuffer bufp);
+ inkapi INK_DEPRECATED void INKMBufferRef(INKMBuffer bufp);
/** @deprecated */
- inkapi void INKMBufferUnref(INKMBuffer bufp);
+ inkapi INK_DEPRECATED void INKMBufferUnref(INKMBuffer bufp);
/** @deprecated */
- inkapi void INKMBufferCompress(INKMBuffer bufp);
+ inkapi INK_DEPRECATED void INKMBufferCompress(INKMBuffer bufp);
/* --------------------------------------------------------------------------
YTS Team, yamsat Plugin */
/** @deprecated */
- inkapi int INKHttpTxnCreateRequest(INKHttpTxn txnp, const char *, const char *, int);
+ inkapi INK_DEPRECATED int INKHttpTxnCreateRequest(INKHttpTxn txnp, const char *, const char *, int);
/* --------------------------------------------------------------------------
Deprecated MIME field functions --- use INKMimeHdrFieldXXX instead */
/** @deprecated */
- inkapi INKMLoc INKMimeFieldCreate(INKMBuffer bufp);
+ inkapi INK_DEPRECATED INKMLoc INKMimeFieldCreate(INKMBuffer bufp);
/** @deprecated */
- inkapi void INKMimeFieldDestroy(INKMBuffer bufp, INKMLoc offset);
+ inkapi INK_DEPRECATED void INKMimeFieldDestroy(INKMBuffer bufp, INKMLoc offset);
/** @deprecated */
- inkapi void INKMimeFieldCopy(INKMBuffer dest_bufp, INKMLoc dest_offset, INKMBuffer src_bufp, INKMLoc src_offset);
+ inkapi INK_DEPRECATED void INKMimeFieldCopy(INKMBuffer dest_bufp, INKMLoc dest_offset, INKMBuffer src_bufp, INKMLoc src_offset);
/** @deprecated */
- inkapi void INKMimeFieldCopyValues(INKMBuffer dest_bufp, INKMLoc dest_offset, INKMBuffer src_bufp,
+ inkapi INK_DEPRECATED void INKMimeFieldCopyValues(INKMBuffer dest_bufp, INKMLoc dest_offset, INKMBuffer src_bufp,
INKMLoc src_offset);
/** @deprecated */
- inkapi INKMLoc INKMimeFieldNext(INKMBuffer bufp, INKMLoc offset);
+ inkapi INK_DEPRECATED INKMLoc INKMimeFieldNext(INKMBuffer bufp, INKMLoc offset);
/** @deprecated */
- inkapi int INKMimeFieldLengthGet(INKMBuffer bufp, INKMLoc offset);
+ inkapi INK_DEPRECATED int INKMimeFieldLengthGet(INKMBuffer bufp, INKMLoc offset);
/** @deprecated */
- inkapi const char *INKMimeFieldNameGet(INKMBuffer bufp, INKMLoc offset, int *length);
+ inkapi INK_DEPRECATED const char *INKMimeFieldNameGet(INKMBuffer bufp, INKMLoc offset, int *length);
/** @deprecated */
- inkapi void INKMimeFieldNameSet(INKMBuffer bufp, INKMLoc offset, const char *name, int length);
+ inkapi INK_DEPRECATED void INKMimeFieldNameSet(INKMBuffer bufp, INKMLoc offset, const char *name, int length);
/** @deprecated */
- inkapi void INKMimeFieldValuesClear(INKMBuffer bufp, INKMLoc offset);
+ inkapi INK_DEPRECATED void INKMimeFieldValuesClear(INKMBuffer bufp, INKMLoc offset);
/** @deprecated */
- inkapi int INKMimeFieldValuesCount(INKMBuffer bufp, INKMLoc offset);
+ inkapi INK_DEPRECATED int INKMimeFieldValuesCount(INKMBuffer bufp, INKMLoc offset);
/** @deprecated */
- inkapi const char *INKMimeFieldValueGet(INKMBuffer bufp, INKMLoc offset, int idx, int *length);
+ inkapi INK_DEPRECATED const char *INKMimeFieldValueGet(INKMBuffer bufp, INKMLoc offset, int idx, int *length);
/** @deprecated */
- inkapi int INKMimeFieldValueGetInt(INKMBuffer bufp, INKMLoc offset, int idx);
+ inkapi INK_DEPRECATED int INKMimeFieldValueGetInt(INKMBuffer bufp, INKMLoc offset, int idx);
/** @deprecated */
- inkapi unsigned int INKMimeFieldValueGetUint(INKMBuffer bufp, INKMLoc offset, int idx);
+ inkapi INK_DEPRECATED unsigned int INKMimeFieldValueGetUint(INKMBuffer bufp, INKMLoc offset, int idx);
/** @deprecated */
- inkapi time_t INKMimeFieldValueGetDate(INKMBuffer bufp, INKMLoc offset, int idx);
+ inkapi INK_DEPRECATED time_t INKMimeFieldValueGetDate(INKMBuffer bufp, INKMLoc offset, int idx);
/** @deprecated */
- inkapi void INKMimeFieldValueSet(INKMBuffer bufp, INKMLoc offset, int idx, const char *value, int length);
+ inkapi INK_DEPRECATED void INKMimeFieldValueSet(INKMBuffer bufp, INKMLoc offset, int idx, const char *value, int length);
/** @deprecated */
- inkapi void INKMimeFieldValueSetInt(INKMBuffer bufp, INKMLoc offset, int idx, int value);
+ inkapi INK_DEPRECATED void INKMimeFieldValueSetInt(INKMBuffer bufp, INKMLoc offset, int idx, int value);
/** @deprecated */
- inkapi void INKMimeFieldValueSetUint(INKMBuffer bufp, INKMLoc offset, int idx, unsigned int value);
+ inkapi INK_DEPRECATED void INKMimeFieldValueSetUint(INKMBuffer bufp, INKMLoc offset, int idx, unsigned int value);
/** @deprecated */
- inkapi void INKMimeFieldValueSetDate(INKMBuffer bufp, INKMLoc offset, int idx, time_t value);
+ inkapi INK_DEPRECATED void INKMimeFieldValueSetDate(INKMBuffer bufp, INKMLoc offset, int idx, time_t value);
/** @deprecated */
- inkapi void INKMimeFieldValueAppend(INKMBuffer bufp, INKMLoc offset, int idx, const char *value, int length);
+ inkapi INK_DEPRECATED void INKMimeFieldValueAppend(INKMBuffer bufp, INKMLoc offset, int idx, const char *value, int length);
/** @deprecated */
- inkapi INKMLoc INKMimeFieldValueInsert(INKMBuffer bufp, INKMLoc offset, const char *value, int length, int idx);
+ inkapi INK_DEPRECATED INKMLoc INKMimeFieldValueInsert(INKMBuffer bufp, INKMLoc offset, const char *value, int length, int idx);
/** @deprecated */
- inkapi INKMLoc INKMimeFieldValueInsertInt(INKMBuffer bufp, INKMLoc offset, int value, int idx);
+ inkapi INK_DEPRECATED INKMLoc INKMimeFieldValueInsertInt(INKMBuffer bufp, INKMLoc offset, int value, int idx);
/** @deprecated */
- inkapi INKMLoc INKMimeFieldValueInsertUint(INKMBuffer bufp, INKMLoc offset, unsigned int value, int idx);
+ inkapi INK_DEPRECATED INKMLoc INKMimeFieldValueInsertUint(INKMBuffer bufp, INKMLoc offset, unsigned int value, int idx);
/** @deprecated */
- inkapi INKMLoc INKMimeFieldValueInsertDate(INKMBuffer bufp, INKMLoc offset, time_t value, int idx);
+ inkapi INK_DEPRECATED INKMLoc INKMimeFieldValueInsertDate(INKMBuffer bufp, INKMLoc offset, time_t value, int idx);
/** @deprecated */
- inkapi void INKMimeFieldValueDelete(INKMBuffer bufp, INKMLoc offset, int idx);
+ inkapi INK_DEPRECATED void INKMimeFieldValueDelete(INKMBuffer bufp, INKMLoc offset, int idx);
/* --------------------------------------------------------------------------
Deprecated MIME field functions in SDK3.0 */
/** @deprecated Use INKMimeHdrFieldAppend() instead */
- inkapi INKReturnCode INKMimeHdrFieldInsert(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx);
+ inkapi INK_DEPRECATED INKReturnCode INKMimeHdrFieldInsert(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx);
/** @deprecated Use INKMimeHdrFieldStringInsert() instead */
- inkapi INKReturnCode INKMimeHdrFieldValueInsert(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, const char *value, int length, int idx);
+ inkapi INK_DEPRECATED INKReturnCode INKMimeHdrFieldValueInsert(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, const char *value, int length, int idx);
/** @deprecated Use INKMimeHdrFieldIntInsert() instead */
- inkapi INKReturnCode INKMimeHdrFieldValueInsertInt(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int value, int idx);
+ inkapi INK_DEPRECATED INKReturnCode INKMimeHdrFieldValueInsertInt(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int value, int idx);
/** @deprecated Use INKMimeHdrFieldUintInsert() instead */
- inkapi INKReturnCode INKMimeHdrFieldValueInsertUint(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, unsigned int value, int idx);
+ inkapi INK_DEPRECATED INKReturnCode INKMimeHdrFieldValueInsertUint(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, unsigned int value, int idx);
/** @deprecated Use INKMimeHdrFieldDateInsert() instead */
- inkapi INKReturnCode INKMimeHdrFieldValueInsertDate(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, time_t value, int idx);
+ inkapi INK_DEPRECATED INKReturnCode INKMimeHdrFieldValueInsertDate(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, time_t value, int idx);
/** @deprecated Use INKMimeHdrFieldStringGet() instead */
- inkapi const char *INKMimeHdrFieldValueGet(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx, int *value_len_ptr);
+ inkapi INK_DEPRECATED const char *INKMimeHdrFieldValueGet(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx, int *value_len_ptr);
/** @deprecated Use INKMimeHdrFieldIntGet() instead */
- inkapi int INKMimeHdrFieldValueGetInt(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx);
+ inkapi INK_DEPRECATED int INKMimeHdrFieldValueGetInt(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx);
/** @deprecated Use INKMimeHdrFieldUintGet() instead */
- inkapi unsigned int INKMimeHdrFieldValueGetUint(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx);
+ inkapi INK_DEPRECATED unsigned int INKMimeHdrFieldValueGetUint(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx);
/** @deprecated Use INKMimeHdrFieldDateGet() instead */
- inkapi time_t INKMimeHdrFieldValueGetDate(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx);
+ inkapi INK_DEPRECATED time_t INKMimeHdrFieldValueGetDate(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx);
/** @deprecated Use INKMimeHdrFieldStringSet() instead */
- inkapi INKReturnCode INKMimeHdrFieldValueSet(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx, const char *value, int length);
+ inkapi INK_DEPRECATED INKReturnCode INKMimeHdrFieldValueSet(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx, const char *value, int length);
/** @deprecated Use INKMimeHdrFieldIntSet() instead */
- inkapi INKReturnCode INKMimeHdrFieldValueSetInt(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx, int value);
+ inkapi INK_DEPRECATED INKReturnCode INKMimeHdrFieldValueSetInt(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx, int value);
/** @deprecated Use INKMimeHdrFieldUintSet() instead */
- inkapi INKReturnCode INKMimeHdrFieldValueSetUint(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx, unsigned int value);
+ inkapi INK_DEPRECATED INKReturnCode INKMimeHdrFieldValueSetUint(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx, unsigned int value);
/** @deprecated Use INKMimeHdrFieldDateSet() instead */
- inkapi INKReturnCode INKMimeHdrFieldValueSetDate(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx, time_t value);
+ inkapi INK_DEPRECATED INKReturnCode INKMimeHdrFieldValueSetDate(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx, time_t value);
/** @deprecated Use INKMimeHdrFieldDestroy() instead */
- inkapi INKReturnCode INKMimeHdrFieldDelete(INKMBuffer bufp, INKMLoc hdr, INKMLoc field);
+ inkapi INK_DEPRECATED INKReturnCode INKMimeHdrFieldDelete(INKMBuffer bufp, INKMLoc hdr, INKMLoc field);
/** @deprecated */
- inkapi INKReturnCode INKCacheBufferInfoGet(INKCacheTxn txnp, INKU64 * length, INKU64 * offset);
+ inkapi INK_DEPRECATED INKReturnCode INKCacheBufferInfoGet(INKCacheTxn txnp, INKU64 * length, INKU64 * offset);
/* --------------------------------------------------------------------------
cache http info APIs */
/** @deprecated */
- inkapi INKCacheHttpInfo INKCacheHttpInfoCreate();
+ inkapi INK_DEPRECATED INKCacheHttpInfo INKCacheHttpInfoCreate();
/** @deprecated */
- inkapi void INKCacheHttpInfoReqGet(INKCacheHttpInfo infop, INKMBuffer * bufp, INKMLoc * obj);
+ inkapi INK_DEPRECATED void INKCacheHttpInfoReqGet(INKCacheHttpInfo infop, INKMBuffer * bufp, INKMLoc * obj);
/** @deprecated */
- inkapi void INKCacheHttpInfoRespGet(INKCacheHttpInfo infop, INKMBuffer * bufp, INKMLoc * obj);
+ inkapi INK_DEPRECATED void INKCacheHttpInfoRespGet(INKCacheHttpInfo infop, INKMBuffer * bufp, INKMLoc * obj);
/** @deprecated */
- inkapi void INKCacheHttpInfoReqSet(INKCacheHttpInfo infop, INKMBuffer bufp, INKMLoc obj);
+ inkapi INK_DEPRECATED void INKCacheHttpInfoReqSet(INKCacheHttpInfo infop, INKMBuffer bufp, INKMLoc obj);
/** @deprecated */
- inkapi void INKCacheHttpInfoRespSet(INKCacheHttpInfo infop, INKMBuffer bufp, INKMLoc obj);
+ inkapi INK_DEPRECATED void INKCacheHttpInfoRespSet(INKCacheHttpInfo infop, INKMBuffer bufp, INKMLoc obj);
/** @deprecated */
- inkapi void INKCacheHttpInfoKeySet(INKCacheHttpInfo infop, INKCacheKey key);
+ inkapi INK_DEPRECATED void INKCacheHttpInfoKeySet(INKCacheHttpInfo infop, INKCacheKey key);
/** @deprecated */
- inkapi void INKCacheHttpInfoSizeSet(INKCacheHttpInfo infop, INKU64 size);
+ inkapi INK_DEPRECATED void INKCacheHttpInfoSizeSet(INKCacheHttpInfo infop, INKU64 size);
/** @deprecated */
- inkapi int INKCacheHttpInfoVector(INKCacheHttpInfo infop, void *data, int length);
+ inkapi INK_DEPRECATED int INKCacheHttpInfoVector(INKCacheHttpInfo infop, void *data, int length);
#ifdef __cplusplus
}