Răsfoiți Sursa

使用rt_xxx替换

Meco Man 4 ani în urmă
părinte
comite
9ae1e2a689
5 a modificat fișierele cu 11 adăugiri și 11 ștergeri
  1. 2 2
      module/wn_module_upload.c
  2. 1 1
      samples/wn_sample_upload.c
  3. 3 3
      src/wn_module.c
  4. 3 3
      src/wn_request.c
  5. 2 2
      src/wn_session.c

+ 2 - 2
module/wn_module_upload.c

@@ -146,7 +146,7 @@ static char* memstrs(const char* str, size_t length, int num, ...)
     for (index = 0; index < num; index++)
     for (index = 0; index < num; index++)
     {
     {
         index_str = va_arg(args, char*);
         index_str = va_arg(args, char*);
-        memcpy(ptr, index_str, strlen(index_str));
+        rt_memcpy(ptr, index_str, strlen(index_str));
         ptr += strlen(index_str);
         ptr += strlen(index_str);
     }
     }
     substr[total_size] = '\0';
     substr[total_size] = '\0';
@@ -385,7 +385,7 @@ static void _handle_section(struct webnet_session* session, char* buffer, rt_siz
         {
         {
             int value_size = ptr - buffer + 1;
             int value_size = ptr - buffer + 1;
             name_entry.value = wn_malloc(value_size);
             name_entry.value = wn_malloc(value_size);
-            memcpy(name_entry.value, buffer, value_size - 1);
+            rt_memcpy(name_entry.value, buffer, value_size - 1);
             name_entry.value[value_size - 1] = '\0';
             name_entry.value[value_size - 1] = '\0';
         }
         }
     }
     }

+ 1 - 1
samples/wn_sample_upload.c

@@ -94,7 +94,7 @@ static int upload_open(struct webnet_session *session)
             goto _exit;
             goto _exit;
         }
         }
 
 
-        sprintf(file_path, "%s/%s/%s", sd_upload, upload_dir, file_name);
+        rt_sprintf(file_path, "%s/%s/%s", sd_upload, upload_dir, file_name);
 
 
         rt_kprintf("save to: %s\r\n", file_path);
         rt_kprintf("save to: %s\r\n", file_path);
 
 

+ 3 - 3
src/wn_module.c

@@ -173,7 +173,7 @@ int webnet_module_system_dofile(struct webnet_session *session)
 
 
         if (path_gz != RT_NULL)
         if (path_gz != RT_NULL)
         {
         {
-            sprintf(path_gz, "%s.gz", request->path);
+            rt_sprintf(path_gz, "%s.gz", request->path);
             stat_result = stat(request->path, &file_stat);
             stat_result = stat(request->path, &file_stat);
             wn_free(path_gz);
             wn_free(path_gz);
         }
         }
@@ -207,7 +207,7 @@ int webnet_module_system_dofile(struct webnet_session *session)
         {
         {
             rt_enter_critical();
             rt_enter_critical();
             info = localtime((time_t *)&file_stat.st_mtime);
             info = localtime((time_t *)&file_stat.st_mtime);
-            memset(gmtime_str,0,32);
+            rt_memset(gmtime_str,0,32);
             strftime(gmtime_str,sizeof(ctime_str),"%a, %d %b %Y %H:%M:%S GMT",info);
             strftime(gmtime_str,sizeof(ctime_str),"%a, %d %b %Y %H:%M:%S GMT",info);
             
             
             strcpy(ctime_str, ctime((time_t *)&file_stat.st_mtime));
             strcpy(ctime_str, ctime((time_t *)&file_stat.st_mtime));
@@ -236,7 +236,7 @@ int webnet_module_system_dofile(struct webnet_session *session)
 
 
         if (path_gz != RT_NULL)
         if (path_gz != RT_NULL)
         {
         {
-            sprintf(path_gz, "%s.gz", request->path);
+            rt_sprintf(path_gz, "%s.gz", request->path);
             fd = open(path_gz, O_RDONLY, 0);
             fd = open(path_gz, O_RDONLY, 0);
             wn_free(path_gz);
             wn_free(path_gz);
 
 

+ 3 - 3
src/wn_request.c

@@ -502,7 +502,7 @@ int webnet_request_parse_post(struct webnet_request* request, char* buffer, int
         if (request->query_offset + length > request->content_length)
         if (request->query_offset + length > request->content_length)
             length = request->content_length - request->query_offset;
             length = request->content_length - request->query_offset;
 
 
-        memcpy(&request->query[request->query_offset], buffer, length);
+        rt_memcpy(&request->query[request->query_offset], buffer, length);
         request->query_offset += length;
         request->query_offset += length;
 
 
         if (request->query_offset == request->content_length)
         if (request->query_offset == request->content_length)
@@ -694,7 +694,7 @@ void webnet_request_parse(struct webnet_request* request, char* buffer, int leng
                          * NOTIC: the rest of buffer must not be great than session buffer
                          * NOTIC: the rest of buffer must not be great than session buffer
                          * Therefore, the size of read buffer can equal to the size of session buffer.
                          * Therefore, the size of read buffer can equal to the size of session buffer.
                          */
                          */
-                        memcpy(session->buffer, request->query, session->buffer_offset);
+                        rt_memcpy(session->buffer, request->query, session->buffer_offset);
                     }
                     }
                     request->query = RT_NULL;
                     request->query = RT_NULL;
                     return;
                     return;
@@ -722,7 +722,7 @@ void webnet_request_parse(struct webnet_request* request, char* buffer, int leng
                 if (read_length > 0)
                 if (read_length > 0)
                 {
                 {
                     if (read_length > request->content_length) read_length = request->content_length;
                     if (read_length > request->content_length) read_length = request->content_length;
-                    memcpy(read_ptr, request->query, read_length);
+                    rt_memcpy(read_ptr, request->query, read_length);
                 }
                 }
                 request->query = read_ptr;
                 request->query = read_ptr;
 
 

+ 2 - 2
src/wn_session.c

@@ -51,7 +51,7 @@ struct webnet_session* webnet_session_create(int listenfd)
     {
     {
         socklen_t clilen;
         socklen_t clilen;
 		
 		
-        memset(session, 0x0, sizeof(struct webnet_session));
+        rt_memset(session, 0x0, sizeof(struct webnet_session));
         session->session_ops = RT_NULL;
         session->session_ops = RT_NULL;
 
 
         clilen = sizeof(struct sockaddr_in);
         clilen = sizeof(struct sockaddr_in);
@@ -158,7 +158,7 @@ void webnet_session_printf(struct webnet_session *session, const char* fmt, ...)
     rt_uint32_t length;
     rt_uint32_t length;
 
 
     va_start(args, fmt);
     va_start(args, fmt);
-    length = vsnprintf((char*)(session->buffer),
+    length = rt_vsnprintf((char*)(session->buffer),
                        sizeof(session->buffer) - 1,
                        sizeof(session->buffer) - 1,
                        fmt, args);
                        fmt, args);
     session->buffer[length] = '\0';
     session->buffer[length] = '\0';