From 9d91b96cf7cdc54f0a9a8618b3e9e36e8f9767aa Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Wed, 24 Jun 2020 09:09:56 +0000 Subject: [PATCH] fixed wrong functions names in mar-cli.c --- mio/bin/t04.c | 14 +++++++------- mio/lib/mar-cli.c | 4 ++-- mio/lib/mar.c | 4 ---- mio/lib/mio-mar.h | 18 ++++++++++++------ 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/mio/bin/t04.c b/mio/bin/t04.c index 894c1bc..6f73c8c 100644 --- a/mio/bin/t04.c +++ b/mio/bin/t04.c @@ -167,14 +167,14 @@ static void send_test_query (mio_t* mio, const mio_ntime_t* now, mio_tmrjob_t* j mio_bch_t tmp[256]; int len; - if (mio_svc_mar_querywithbchars(marc, 0, MIO_SVC_MARC_QTYPE_SELECT, "SHOW STATUS", 11, on_result, MIO_NULL) <= -1) + if (mio_svc_marc_querywithbchars(marc, 0, MIO_SVC_MARC_QTYPE_SELECT, "SHOW STATUS", 11, on_result, MIO_NULL) <= -1) { MIO_INFO1 (mio, "FAILED TO SEND QUERY - %js\n", mio_geterrmsg(mio)); } - mio_svc_mar_escapebchars (marc, "wild", 4, tmp); + mio_svc_marc_escapebchars (marc, "wild", 4, tmp); len = snprintf(buf, MIO_COUNTOF(buf), "SELECT name, content FROM records WHERE name like '%%%s%%'", tmp); - if (mio_svc_mar_querywithbchars(marc, 1, MIO_SVC_MARC_QTYPE_SELECT, buf, len, on_result, MIO_NULL) <= -1) + if (mio_svc_marc_querywithbchars(marc, 1, MIO_SVC_MARC_QTYPE_SELECT, buf, len, on_result, MIO_NULL) <= -1) { MIO_INFO1 (mio, "FAILED TO SEND QUERY - %js\n", mio_geterrmsg(mio)); } @@ -238,10 +238,10 @@ int main (int argc, char* argv[]) goto oops; } - mio_svc_mar_querywithbchars (marc, 0, MIO_SVC_MARC_QTYPE_SELECT, "SHOW STATUS", 11, on_result, MIO_NULL); - mio_svc_mar_querywithbchars (marc, 0, MIO_SVC_MARC_QTYPE_ACTION, "DELETE FROM", 11, on_result, MIO_NULL); -// mio_svc_mar_querywithbchars (marc, 0, MIO_SVC_MARC_QTYPE_SELECT, "SHOW STATUS", 11, on_result, MIO_NULL); - mio_svc_mar_querywithbchars (marc, 0, MIO_SVC_MARC_QTYPE_ACTION, "DELETE FROM XXX", 14, on_result, MIO_NULL); + mio_svc_marc_querywithbchars (marc, 0, MIO_SVC_MARC_QTYPE_SELECT, "SHOW STATUS", 11, on_result, MIO_NULL); + mio_svc_marc_querywithbchars (marc, 0, MIO_SVC_MARC_QTYPE_ACTION, "DELETE FROM", 11, on_result, MIO_NULL); +// mio_svc_marc_querywithbchars (marc, 0, MIO_SVC_MARC_QTYPE_SELECT, "SHOW STATUS", 11, on_result, MIO_NULL); + mio_svc_marc_querywithbchars (marc, 0, MIO_SVC_MARC_QTYPE_ACTION, "DELETE FROM XXX", 14, on_result, MIO_NULL); #if 0 memset (&mi, 0, MIO_SIZEOF(mi)); diff --git a/mio/lib/mar-cli.c b/mio/lib/mar-cli.c index 806f24c..3e2a766 100644 --- a/mio/lib/mar-cli.c +++ b/mio/lib/mar-cli.c @@ -434,7 +434,7 @@ static sess_t* get_session (mio_svc_marc_t* marc, mio_oow_t sid) } -int mio_svc_mar_querywithbchars (mio_svc_marc_t* marc, mio_oow_t sid, mio_svc_marc_qtype_t qtype, const mio_bch_t* qptr, mio_oow_t qlen, mio_svc_marc_on_result_t on_result, void* qctx) +int mio_svc_marc_querywithbchars (mio_svc_marc_t* marc, mio_oow_t sid, mio_svc_marc_qtype_t qtype, const mio_bch_t* qptr, mio_oow_t qlen, mio_svc_marc_on_result_t on_result, void* qctx) { mio_t* mio = marc->mio; sess_t* sess; @@ -483,7 +483,7 @@ int mio_svc_mar_querywithbchars (mio_svc_marc_t* marc, mio_oow_t sid, mio_svc_ma return 0; } -mio_oow_t mio_svc_mar_escapebchars (mio_svc_marc_t* marc, const mio_bch_t* qptr, mio_oow_t qlen, mio_bch_t* buf) +mio_oow_t mio_svc_marc_escapebchars (mio_svc_marc_t* marc, const mio_bch_t* qptr, mio_oow_t qlen, mio_bch_t* buf) { return mysql_real_escape_string(marc->edev, buf, qptr, qlen); } diff --git a/mio/lib/mar.c b/mio/lib/mar.c index 4897866..6e9b8c4 100644 --- a/mio/lib/mar.c +++ b/mio/lib/mar.c @@ -177,7 +177,6 @@ static void start_fetch_row (mio_dev_mar_t* rdev) MIO_DEV_MAR_SET_PROGRESS (rdev, MIO_DEV_MAR_ROW_FETCHING); if (status) { -printf ("fetch_row_start not fetched %d\n", status); /* row not fetched */ rdev->row_fetched_deferred = 0; watch_mysql (rdev, status); @@ -185,7 +184,6 @@ printf ("fetch_row_start not fetched %d\n", status); else { /* row fetched - don't handle it immediately here */ -printf ("fetch_row_start returning %d %p \n", status, row); rdev->row_fetched_deferred = 1; rdev->row_wstatus = status; rdev->row = row; @@ -502,7 +500,6 @@ static int dev_evcb_mar_ready (mio_dev_t* dev, int events) MIO_DEV_MAR_SET_PROGRESS (rdev, MIO_DEV_MAR_ROW_FETCHED); if (MIO_LIKELY(rdev->on_row_fetched)) rdev->on_row_fetched (rdev, row); -printf ("CALLING sTARTING FFETCH ROW %p \n", row); if (row) start_fetch_row (rdev); } else @@ -510,7 +507,6 @@ printf ("CALLING sTARTING FFETCH ROW %p \n", row); /* TODO: if rdev->res is MIO_NULL, error.. */ status = mysql_fetch_row_cont(&row, rdev->res, events_to_mysql_wstatus(events)); -printf ("FETCH_ROW -> %d %p\n", status, row); if (!status) { /* row is available */ diff --git a/mio/lib/mio-mar.h b/mio/lib/mio-mar.h index 72d7690..f78b1a8 100644 --- a/mio/lib/mio-mar.h +++ b/mio/lib/mio-mar.h @@ -237,6 +237,12 @@ static MIO_INLINE void mio_dev_mar_halt (mio_dev_mar_t* mar) { mio_dev_halt ((mi # define mio_dev_mar_halt(mar) mio_dev_halt((mio_dev_t*)mar) #endif +MIO_EXPORT mio_oow_t mio_dev_mar_escapebchars ( + mio_dev_mar_t* dev, + const mio_bch_t* qstr, + mio_oow_t qlen, + mio_bch_t* buf +); /* ------------------------------------------------------------------------- */ /* MARDB CLIENT SERVICE */ @@ -258,7 +264,7 @@ static MIO_INLINE mio_t* mio_svc_marc_getmio(mio_svc_marc_t* svc) { return mio_s # define mio_svc_marc_getmio(svc) mio_svc_getmio(svc) #endif -MIO_EXPORT int mio_svc_mar_querywithbchars ( +MIO_EXPORT int mio_svc_marc_querywithbchars ( mio_svc_marc_t* marc, mio_oow_t sid, mio_svc_marc_qtype_t qtype, @@ -268,11 +274,11 @@ MIO_EXPORT int mio_svc_mar_querywithbchars ( void* qctx ); -MIO_EXPORT mio_oow_t mio_dev_mar_escapebchars ( - mio_dev_mar_t* dev, - const mio_bch_t* qstr, - mio_oow_t qlen, - mio_bch_t* buf +MIO_EXPORT mio_oow_t mio_svc_marc_escapebchars ( + mio_svc_marc_t* marc, + const mio_bch_t* qstr, + mio_oow_t qlen, + mio_bch_t* buf ); #ifdef __cplusplus