Merge pull request #318 from tboox/clos

rename clos to close

Author: waruqi

src/demo/coroutine/pipe.c

@@ -12,7 +12,7 @@
 /* //////////////////////////////////////////////////////////////////////////////////////
  * private implementation
  */
-static tb_void_t tb_demo_coroutine_writ(tb_cpointer_t priv)
+static tb_void_t tb_demo_coroutine_write(tb_cpointer_t priv)
 {
     tb_byte_t data[BUFSIZE];
     tb_pipe_file_ref_t pipe = (tb_pipe_file_ref_t) priv;
@@ -48,7 +48,7 @@ tb_int_t tb_demo_coroutine_pipe_main(tb_int_t argc, tb_char_t** argv)
         if (tb_pipe_file_init_pair(pair, tb_null, 4096))
         {
             // start coroutines
-            tb_coroutine_start(scheduler, tb_demo_coroutine_writ, pair[1], 0);
+            tb_coroutine_start(scheduler, tb_demo_coroutine_write, pair[1], 0);
             tb_coroutine_start(scheduler, tb_demo_coroutine_read, pair[0], 0);
 
             // do loop

src/demo/coroutine/spider.c

@@ -300,12 +300,12 @@ static tb_bool_t tb_demo_spider_parser_open(tb_demo_spider_parser_ref_t parser,
     } while (0);
 
     // failed?
-    if (!ok) tb_stream_clos(parser->stream);
+    if (!ok) tb_stream_close(parser->stream);
 
     // ok?
     return ok;
 }
-static tb_void_t tb_demo_spider_parser_clos(tb_demo_spider_parser_ref_t parser)
+static tb_void_t tb_demo_spider_parser_close(tb_demo_spider_parser_ref_t parser)
 {
     // check
     tb_assert_and_check_return(parser);
@@ -315,7 +315,7 @@ static tb_void_t tb_demo_spider_parser_clos(tb_demo_spider_parser_ref_t parser)
     parser->offset = 0;
 
     // close stream
-    if (parser->stream) tb_stream_clos(parser->stream);
+    if (parser->stream) tb_stream_close(parser->stream);
 }
 static tb_char_t const* tb_demo_spider_parser_read(tb_demo_spider_parser_ref_t parser)
 {
@@ -551,12 +551,12 @@ static tb_void_t tb_demo_spider_page_grab(tb_cpointer_t priv)
                 }
 
                 // close parser
-                tb_demo_spider_parser_clos(parser);
+                tb_demo_spider_parser_close(parser);
             }
         }
 
         // close stream
-        tb_stream_clos(stream);
+        tb_stream_close(stream);
 
         // exit url
         tb_free(iurl);

src/demo/memory/queue_buffer.c

@@ -12,9 +12,9 @@ tb_int_t tb_demo_memory_queue_buffer_main(tb_int_t argc, tb_char_t** argv)
     tb_queue_buffer_t   b;
     tb_queue_buffer_init(&b, 1024);
 
-    tb_queue_buffer_writ(&b, (tb_byte_t const*)"hello", 5);
-    tb_queue_buffer_writ(&b, (tb_byte_t const*)" ", 1);
-    tb_queue_buffer_writ(&b, (tb_byte_t const*)"world", 6);
+    tb_queue_buffer_write(&b, (tb_byte_t const*)"hello", 5);
+    tb_queue_buffer_write(&b, (tb_byte_t const*)" ", 1);
+    tb_queue_buffer_write(&b, (tb_byte_t const*)"world", 6);
     tb_queue_buffer_read(&b, (tb_byte_t*)d, 1024);
     tb_trace_i("%s", d);
 

src/demo/platform/file.c

@@ -30,7 +30,7 @@ tb_int_t tb_demo_platform_file_main(tb_int_t argc, tb_char_t** argv)
             // writ file
             while (writ < size)
             {
-                tb_long_t real = tb_file_writ(file, buff, tb_min(maxn, size - writ));
+                tb_long_t real = tb_file_write(file, buff, tb_min(maxn, size - writ));
 //              tb_trace_i("real: %ld, size: %lu", real, tb_min(maxn, size - writ));
                 if (real > 0) writ += real;
                 else if (!real) ;
@@ -89,7 +89,7 @@ tb_int_t tb_demo_platform_file_main(tb_int_t argc, tb_char_t** argv)
             tb_memcpy(data + maxn + maxn + maxn, list[3].data, list[3].size);
 
             // writ
-            tb_long_t real = tb_file_writ(file, data, tb_min((size - writ), (maxn << 2)));
+            tb_long_t real = tb_file_write(file, data, tb_min((size - writ), (maxn << 2)));
             if (real > 0) writ += real;
             else if (!real) ;
             else break;
@@ -153,7 +153,7 @@ tb_int_t tb_demo_platform_file_main(tb_int_t argc, tb_char_t** argv)
             }
 
             // writ
-            tb_long_t real = tb_file_writv(file, list, 4);
+            tb_long_t real = tb_file_writev(file, list, 4);
             if (real > 0) writ += real;
             else if (!real) ;
             else break;
@@ -189,7 +189,7 @@ tb_int_t tb_demo_platform_file_main(tb_int_t argc, tb_char_t** argv)
         tb_hize_t size = tb_file_size(ifile);
         while (writ < size)
         {
-            tb_long_t real = tb_file_writf(ofile, ifile, writ, size - writ);
+            tb_long_t real = tb_file_writef(ofile, ifile, writ, size - writ);
             if (real > 0) writ += real;
             else break;
         }

src/demo/platform/poller_pipe.c

@@ -62,7 +62,7 @@ static tb_long_t tb_demo_session_read(tb_demo_client_ref_t client)
     tb_trace_d("[%p]: read %llu", client->pipe, client->size);
     return 0;
 }
-static tb_int_t tb_demo_session_writ(tb_cpointer_t priv)
+static tb_int_t tb_demo_session_write(tb_cpointer_t priv)
 {
     tb_pipe_file_ref_t pipe = (tb_pipe_file_ref_t)priv;
     tb_byte_t data[8192 * 16];
@@ -105,7 +105,7 @@ static tb_void_t tb_demo_poller_open(tb_poller_ref_t poller)
     if (tb_pipe_file_init_pair(pair, tb_null, 4096))
     {
         tb_demo_session_start(poller, pair[0]);
-        tb_thread_init(tb_null, tb_demo_session_writ, pair[1], 0);
+        tb_thread_init(tb_null, tb_demo_session_write, pair[1], 0);
     }
 }
 static tb_void_t tb_demo_poller_event(tb_poller_ref_t poller, tb_poller_object_ref_t object, tb_long_t events, tb_cpointer_t priv)

src/demo/platform/process.c

@@ -258,7 +258,7 @@ static tb_void_t tb_demo_process_test_redirect_stdin_only(tb_char_t const* test_
         if (file)
         {
             tb_char_t const* content = "test input\n";
-            tb_file_writ(file, (tb_byte_t const*)content, tb_strlen(content));
+            tb_file_write(file, (tb_byte_t const*)content, tb_strlen(content));
             tb_file_exit(file);
         }
 

src/demo/platform/stdfile.c

@@ -6,10 +6,10 @@
 /* //////////////////////////////////////////////////////////////////////////////////////
  * implementation
  */
-static tb_void_t tb_test_writ()
+static tb_void_t tb_test_write()
 {
     tb_trace_i("=================== test stdfile writ ===================");
-    tb_stdfile_writ(tb_stdfile_output(), (tb_byte_t const*)"hello world!\n", tb_strlen("hello world!\n"));
+    tb_stdfile_write(tb_stdfile_output(), (tb_byte_t const*)"hello world!\n", tb_strlen("hello world!\n"));
 }
 static tb_void_t tb_test_read()
 {
@@ -80,7 +80,7 @@ static tb_void_t tb_test_peek()
  */
 tb_int_t tb_demo_platform_stdfile_main(tb_int_t argc, tb_char_t** argv)
 {
-    tb_test_writ();
+    tb_test_write();
     tb_test_putc();
     tb_test_puts();
     tb_test_read();

src/tbox/database/impl/mysql.c

@@ -216,7 +216,7 @@ static tb_bool_t tb_database_mysql_stream_impl_open(tb_stream_ref_t stream)
     // ok
     return tb_true;
 }
-static tb_bool_t tb_database_mysql_stream_impl_clos(tb_stream_ref_t stream)
+static tb_bool_t tb_database_mysql_stream_impl_close(tb_stream_ref_t stream)
 {
     // check
     tb_database_mysql_stream_impl_t* impl = (tb_database_mysql_stream_impl_t*)stream;
@@ -310,7 +310,7 @@ static tb_stream_ref_t tb_database_mysql_stream_impl_init(MYSQL_STMT* statement,
                                             ,   sizeof(tb_database_mysql_stream_impl_t)
                                             ,   0
                                             ,   tb_database_mysql_stream_impl_open
-                                            ,   tb_database_mysql_stream_impl_clos
+                                            ,   tb_database_mysql_stream_impl_close
                                             ,   tb_null
                                             ,   tb_database_mysql_stream_impl_ctrl
                                             ,   tb_database_mysql_stream_impl_wait
@@ -832,7 +832,7 @@ static tb_bool_t tb_database_mysql_open(tb_database_sql_impl_t* database)
     // ok?
     return ok;
 }
-static tb_void_t tb_database_mysql_clos(tb_database_sql_impl_t* database)
+static tb_void_t tb_database_mysql_close(tb_database_sql_impl_t* database)
 {
     // check
     tb_database_mysql_t* mysql = tb_database_mysql_cast(database);
@@ -856,7 +856,7 @@ static tb_void_t tb_database_mysql_exit(tb_database_sql_impl_t* database)
     tb_assert_and_check_return(mysql);
 
     // close it first
-    tb_database_mysql_clos(database);
+    tb_database_mysql_close(database);
 
     // exit bind data
     tb_buffer_exit(&mysql->bind_data);
@@ -1631,7 +1631,7 @@ tb_database_sql_ref_t tb_database_mysql_init(tb_url_ref_t url)
         // init database
         mysql->base.type            = TB_DATABASE_SQL_TYPE_MYSQL;
         mysql->base.open            = tb_database_mysql_open;
-        mysql->base.clos            = tb_database_mysql_clos;
+        mysql->base.clos            = tb_database_mysql_close;
         mysql->base.exit            = tb_database_mysql_exit;
         mysql->base.done            = tb_database_mysql_done;
         mysql->base.begin           = tb_database_mysql_begin;

src/tbox/database/impl/sqlite3.c

@@ -393,7 +393,7 @@ static tb_bool_t tb_database_sqlite3_open(tb_database_sql_impl_t* database)
     // ok?
     return ok;
 }
-static tb_void_t tb_database_sqlite3_clos(tb_database_sql_impl_t* database)
+static tb_void_t tb_database_sqlite3_close(tb_database_sql_impl_t* database)
 {
     // check
     tb_database_sqlite3_t* sqlite = tb_database_sqlite3_cast(database);
@@ -414,7 +414,7 @@ static tb_void_t tb_database_sqlite3_exit(tb_database_sql_impl_t* database)
     tb_assert_and_check_return(sqlite);
 
     // close it first
-    tb_database_sqlite3_clos(database);
+    tb_database_sqlite3_close(database);
 
     // exit url
     tb_url_exit(&database->url);
@@ -864,7 +864,7 @@ tb_database_sql_ref_t tb_database_sqlite3_init(tb_url_ref_t url)
         // init database
         sqlite->base.type           = TB_DATABASE_SQL_TYPE_SQLITE3;
         sqlite->base.open           = tb_database_sqlite3_open;
-        sqlite->base.clos           = tb_database_sqlite3_clos;
+        sqlite->base.clos           = tb_database_sqlite3_close;
         sqlite->base.exit           = tb_database_sqlite3_exit;
         sqlite->base.done           = tb_database_sqlite3_done;
         sqlite->base.begin          = tb_database_sqlite3_begin;

src/tbox/database/sql.c

@@ -180,7 +180,9 @@ tb_bool_t tb_database_sql_open(tb_database_sql_ref_t database)
     // ok?
     return impl->bopened;
 }
-tb_void_t tb_database_sql_clos(tb_database_sql_ref_t database)
+// DEPRECATED: use tb_database_sql_close instead
+tb_void_t tb_database_sql_clos(tb_database_sql_ref_t database) { tb_database_sql_close(database); }
+tb_void_t tb_database_sql_close(tb_database_sql_ref_t database)
 {
     // check
     tb_database_sql_impl_t* impl = (tb_database_sql_impl_t*)database;