xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor: rename shell.h

This commit is contained in:
Shengliang Guan 2022-04-20 19:13:22 +08:00
parent 32c24eedb8
commit 0f22cf1d2e
9 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/shell/inc/shellCommand.h
View File

@ -16,7 +16,7 @@
#ifndef _TD_SHELL_COMMAND_H_ #ifndef _TD_SHELL_COMMAND_H_
#define _TD_SHELL_COMMAND_H_ #define _TD_SHELL_COMMAND_H_
#include "shell.h" #include "shellInt.h"
#define LEFT 1 #define LEFT 1
#define RIGHT 2 #define RIGHT 2

12
tools/shell/inc/shell.h → tools/shell/inc/shellInt.h
View File

@ -21,14 +21,10 @@
#include "taos.h" #include "taos.h"
#include "taosdef.h" #include "taosdef.h"
#define MAX_USERNAME_SIZE 64 #define MAX_HISTORY_SIZE 1000
#define MAX_DBNAME_SIZE 64 #define MAX_COMMAND_SIZE 1048586
#define MAX_IP_SIZE 20 #define HISTORY_FILE ".taos_history"
#define MAX_HISTORY_SIZE 1000 #define DEFAULT_RES_SHOW_NUM 100
#define MAX_COMMAND_SIZE 1048586
#define HISTORY_FILE ".taos_history"
#define DEFAULT_RES_SHOW_NUM 100
typedef struct SShellHistory { typedef struct SShellHistory {
char* hist[MAX_HISTORY_SIZE]; char* hist[MAX_HISTORY_SIZE];

2
tools/shell/src/backup/shellCheck.c
View File

@ -18,7 +18,7 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "os.h" #include "os.h"
#include "shell.h" #include "shellInt.h"
#include "shellCommand.h" #include "shellCommand.h"
#include "tglobal.h" #include "tglobal.h"
#include "tutil.h" #include "tutil.h"

2
tools/shell/src/backup/shellDarwin.c
View File

@ -17,7 +17,7 @@
#include "os.h" #include "os.h"
#include "shell.h" #include "shellInt.h"
#include "shellCommand.h" #include "shellCommand.h"
#include "tbase64.h" #include "tbase64.h"

2
tools/shell/src/backup/shellImport.c
View File

@ -18,7 +18,7 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "os.h" #include "os.h"
#include "shell.h" #include "shellInt.h"
#include "shellCommand.h" #include "shellCommand.h"
#include "tglobal.h" #include "tglobal.h"
#include "tutil.h" #include "tutil.h"

2
tools/shell/src/backup/shellWindows.c
View File

@ -14,7 +14,7 @@
#include <stdio.h> #include <stdio.h>
#include "../../../../include/client/taos.h" #include "../../../../include/client/taos.h"
#include "os.h" #include "os.h"
#include "shell.h" #include "shellInt.h"
#include "shellCommand.h" #include "shellCommand.h"
extern char configDir[]; extern char configDir[];

2
tools/shell/src/shellCommand.c
View File

@ -17,7 +17,7 @@
#include "shellCommand.h" #include "shellCommand.h"
#include "os.h" #include "os.h"
#include "shell.h" #include "shellInt.h"
#include <regex.h> #include <regex.h>

2
tools/shell/src/shellEngine.c
View File

@ -19,7 +19,7 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "os.h" #include "os.h"
#include "shell.h" #include "shellInt.h"
#include "shellCommand.h" #include "shellCommand.h"
#include "taosdef.h" #include "taosdef.h"
#include "taoserror.h" #include "taoserror.h"

3
tools/shell/src/shellMain.c
View File

@ -16,7 +16,6 @@
#define __USE_XOPEN #define __USE_XOPEN
#include "shellCommand.h" #include "shellCommand.h"
#include "tglobal.h" #include "tglobal.h"
#include "tlog.h"
#include <argp.h> #include <argp.h>
#include <termio.h> #include <termio.h>
@ -407,7 +406,7 @@ void *shellLoopQuery(void *arg) {
char *command = taosMemoryMalloc(MAX_COMMAND_SIZE); char *command = taosMemoryMalloc(MAX_COMMAND_SIZE);
if (command == NULL) { if (command == NULL) {
uError("failed to malloc command"); printf("failed to malloc command\n");
return NULL; return NULL;
} }