Changeset 6 in Main for trunk/Common

Timestamp:

Sep 13, 2024, 7:28:20 PM (2 months ago)

Author:

Nishi

Message:

vhost

Location:

trunk/Common

Files:

• Makefile (modified) (1 diff)
• log.c (modified) (1 diff)
• string.c (modified) (7 diffs)

trunk/Common/Makefile

@@ -11 +11 @@
 
 common.a: $(OBJS)
-        ar rcs $@ $(OBJS)
+        $(AR) rcs $@ $(OBJS)
 
 .c.o:

trunk/Common/log.c

@@ -40 +40 @@
                                 result = cm_strcat(tmp, va_arg(args, char*));
                                 free(tmp);
+                        } else if(log[i] == 'd') {
+                                int a = va_arg(args, int);
+                                char buf[128];
+                                sprintf(buf, "%d", a);
+                                char* tmp = result;
+                                result = cm_strcat(tmp, buf);
+                                free(tmp);
                         }
                 } else {

trunk/Common/string.c

@@ -16 +16 @@
 char* cm_strdup(const char* str) { return cm_strcat(str, ""); }
 
-char* cm_trimstart(const char* str){
+char* cm_trimstart(const char* str) {
         int i;
-        for(i = 0; str[i] != 0; i++){
-                if(str[i] != ' ' && str[i] != '\t'){
+        for(i = 0; str[i] != 0; i++) {
+                if(str[i] != ' ' && str[i] != '\t') {
                         return cm_strdup(str + i);
                 }
@@ -26 +26 @@
 }
 
-char* cm_trimend(const char* str){
+char* cm_trimend(const char* str) {
         char* s = cm_strdup(str);
         int i;
-        for(i = strlen(s) - 1; i >= 0; i--){
-                if(s[i] != '\t' && s[i] != ' '){
+        for(i = strlen(s) - 1; i >= 0; i--) {
+                if(s[i] != '\t' && s[i] != ' ') {
                         s[i + 1] = 0;
                         break;
@@ -38 +38 @@
 }
 
-char* cm_trim(const char* str){
+char* cm_trim(const char* str) {
         char* tmp = cm_trimstart(str);
         char* s = cm_trimend(tmp);
@@ -45 +45 @@
 }
 
-char** cm_split(const char* str, const char* by){
+char** cm_split(const char* str, const char* by) {
         int i;
         char** r = malloc(sizeof(*r));
@@ -55 +55 @@
         bool dq = false;
         bool sq = false;
-        for(i = 0;; i++){
+        for(i = 0;; i++) {
                 int j;
                 bool has = false;
-                for(j = 0; by[j] != 0; j++){
-                        if(by[j] == str[i]){
+                for(j = 0; by[j] != 0; j++) {
+                        if(by[j] == str[i]) {
                                 has = true;
                                 break;
                         }
                 }
-                if(!(dq || sq) && (has || str[i] == 0)){
-                        if(strlen(b) > 0){
+                if(!(dq || sq) && (has || str[i] == 0)) {
+                        if(strlen(b) > 0) {
                                 char** old = r;
                                 int j;
-                                for(j = 0; old[j] != NULL; j++);
+                                for(j = 0; old[j] != NULL; j++)
+                                        ;
                                 r = malloc(sizeof(*r) * (j + 2));
                                 for(j = 0; old[j] != NULL; j++) r[j] = old[j];
@@ -78 +79 @@
                         b[0] = 0;
                         if(str[i] == 0) break;
-                }else{
-                        if(str[i] == '"' && !sq){
+                } else {
+                        if(str[i] == '"' && !sq) {
                                 dq = !dq;
-                        }else if(str[i] == '\'' && !dq){
+                        } else if(str[i] == '\'' && !dq) {
                                 sq = !sq;
-                        }else{
+                        } else {
                                 cbuf[0] = str[i];
                                 char* tmp = b;
@@ -95 +96 @@
 }
 
-bool cm_strcaseequ(const char* a, const char* b){
+bool cm_strcaseequ(const char* a, const char* b) {
         if(a == NULL) return false;
         if(b == NULL) return false;
         if(strlen(a) != strlen(b)) return false;
         int i;
-        for(i = 0; a[i] != 0; i++){
+        for(i = 0; a[i] != 0; i++) {
                 if(tolower(a[i]) != tolower(b[i])) return false;
         }