reformat

git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@78 d4a5a174-5a4a-5b4b-b672-37683c10d7d5

diff --git a/Client/main.c b/Client/main.c
index ff54203619fe7f31dab45109c4a9311a265fdcce..6b6c47661ade1ccdc43ff6d9bae0174bd4c57647 100644 (file)
--- a/Client/main.c
+++ b/Client/main.c
@@ -1,7 +1,7 @@
 /* $Id$ */
 /* --- START LICENSE --- */
 /* -------------------------------------------------------------------------- */
-/* Copyright (c) 2024 Nishi.                                                  */
+/* Copyright (c) 2024 Crabware.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */
@@ -29,8 +29,8 @@
 #include <dataworks.h>
 
 #include <dw_database.h>
-#include <dw_util.h>
 #include <dw_parser.h>
+#include <dw_util.h>
 
 #include <stdbool.h>
 #include <stdio.h>
@@ -178,14 +178,14 @@ int main(int argc, char** argv) {
                                } else {
                                        printf("Unknown dot-command.\n");
                                }
-                       }else if(strlen(buf) > 0){
+                       } else if(strlen(buf) > 0) {
                                struct __dw_token* token = __dw_parser_parse(buf);
-                               if(token != NULL){
-                                       if(token->error){
+                               if(token != NULL) {
+                                       if(token->error) {
                                                printf("%s\n", dataworks_database_strerror(token->errnum));
-                                       }else{
+                                       } else {
                                        }
-                               }else{
+                               } else {
                                        printf("Parser returned NULL. Help!\n");
                                }
                        }

diff --git a/Library/database.c b/Library/database.c
index edfea1861b5cc73e6c48a1ebf1620d7a1e625c5e..fecb2cabce52ff764d67fe69d633e8acb94ca166 100644 (file)
--- a/Library/database.c
+++ b/Library/database.c
@@ -1,7 +1,7 @@
 /* $Id$ */
 /* --- START LICENSE --- */
 /* -------------------------------------------------------------------------- */
-/* Copyright (c) 2024 Nishi.                                                  */
+/* Copyright (c) 2024 Crabware.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/database_table.c b/Library/database_table.c
index eadc3a5872a2d2bbd1bc0cab5f281e79bc80347b..cc9059b33537c556ddb889128bfea5cd591561f0 100644 (file)
--- a/Library/database_table.c
+++ b/Library/database_table.c
@@ -1,7 +1,7 @@
 /* $Id$ */
 /* --- START LICENSE --- */
 /* -------------------------------------------------------------------------- */
-/* Copyright (c) 2024 Nishi.                                                  */
+/* Copyright (c) 2024 Crabware.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/dataworks.c b/Library/dataworks.c
index 09debc201432bc4dfa2cabb9ef149b63fb162a04..e8631162a7393712251da5f0b82a7b4f8212afee 100644 (file)
--- a/Library/dataworks.c
+++ b/Library/dataworks.c
@@ -1,7 +1,7 @@
 /* $Id$ */
 /* --- START LICENSE --- */
 /* -------------------------------------------------------------------------- */
-/* Copyright (c) 2024 Nishi.                                                  */
+/* Copyright (c) 2024 Crabware.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/dataworks.h b/Library/dataworks.h
index 8a54f7703f93e5529810a1516eafe9a58cb5d6f2..44848777e2ce4549e930af011459a017d0c2aa65 100644 (file)
--- a/Library/dataworks.h
+++ b/Library/dataworks.h
@@ -1,7 +1,7 @@
 /* $Id$ */
 /* --- START LICENSE --- */
 /* -------------------------------------------------------------------------- */
-/* Copyright (c) 2024 Nishi.                                                  */
+/* Copyright (c) 2024 Crabware.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/dw_database.h b/Library/dw_database.h
index d77ff097eb20f01e9601e90668235cf7acbcf117..fe18991206bc516325ef96dc3d1e350390c3f09c 100644 (file)
--- a/Library/dw_database.h
+++ b/Library/dw_database.h
@@ -1,7 +1,7 @@
 /* $Id$ */
 /* --- START LICENSE --- */
 /* -------------------------------------------------------------------------- */
-/* Copyright (c) 2024 Nishi.                                                  */
+/* Copyright (c) 2024 Crabware.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/dw_parser.h b/Library/dw_parser.h
index 8674f8ff00bbf8bf0217000889e78457d301b132..0ebfdca266d37ece71bb34a5fbc77dbff17f29c1 100644 (file)
--- a/Library/dw_parser.h
+++ b/Library/dw_parser.h
@@ -1,7 +1,7 @@
 /* $Id$ */
 /* --- START LICENSE --- */
 /* -------------------------------------------------------------------------- */
-/* Copyright (c) 2024 Nishi.                                                  */
+/* Copyright (c) 2024 Crabware.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */
@@ -42,10 +42,7 @@ extern "C" {
 
 #include <stdbool.h>
 
-enum __token {
-       METHOD = 0,
-       VALUE
-};
+enum __token { METHOD = 0, VALUE };
 
 struct __dw_token {
        char* name;

diff --git a/Library/dw_util.h b/Library/dw_util.h
index ff9ba9a8ef12cb62f6f7ec29779c6a2d28209b41..65f27579751d48af53788ab98bb9d650f3573895 100644 (file)
--- a/Library/dw_util.h
+++ b/Library/dw_util.h
@@ -1,7 +1,7 @@
 /* $Id$ */
 /* --- START LICENSE --- */
 /* -------------------------------------------------------------------------- */
-/* Copyright (c) 2024 Nishi.                                                  */
+/* Copyright (c) 2024 Crabware.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/parser.c b/Library/parser.c
index 604633ae2ac86959956558662015636349cab4a5..0a70a9bba6fb99f1981320dd1fd3f6be97ffb37d 100644 (file)
--- a/Library/parser.c
+++ b/Library/parser.c
@@ -1,7 +1,7 @@
 /* $Id$ */
 /* --- START LICENSE --- */
 /* -------------------------------------------------------------------------- */
-/* Copyright (c) 2024 Nishi.                                                  */
+/* Copyright (c) 2024 Crabware.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */
@@ -31,11 +31,11 @@
 #include "dw_database.h"
 #include "dw_util.h"
 
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <stdbool.h>
 
-struct __dw_token* __dw_parser_parse(const char* str){
+struct __dw_token* __dw_parser_parse(const char* str) {
        struct __dw_token* token = malloc(sizeof(*token));
        token->error = false;
        token->errnum = DW_ERR_SUCCESS;
@@ -49,34 +49,34 @@ struct __dw_token* __dw_parser_parse(const char* str){
        int brace = 0;
        char* br = malloc(1);
        br[0] = 0;
-       for(i = 0; str[i] != 0; i++){
+       for(i = 0; str[i] != 0; i++) {
                cbuf[0] = str[i];
-               if(brace > 0){
+               if(brace > 0) {
                        if(str[i] == '(') brace++;
                        if(str[i] == ')') brace--;
-                       if(brace > 0){
+                       if(brace > 0) {
                                char* tmp = br;
                                br = __dw_strcat(tmp, cbuf);
                                free(tmp);
-                       }else{
+                       } else {
                                printf("%s\n", br);
                                __dw_parser_parse(br);
                        }
-               }else if(dq){
+               } else if(dq) {
                        char* tmp = buf;
                        buf = __dw_strcat(tmp, cbuf);
                        free(tmp);
-               }else if(str[i] == '('){
+               } else if(str[i] == '(') {
                        printf("%s\n", buf);
                        free(buf);
                        buf = malloc(1);
                        buf[0] = 0;
                        brace++;
-               }else if(str[i] == ')'){
+               } else if(str[i] == ')') {
                        brace--;
-               }else if(str[i] == '"'){
+               } else if(str[i] == '"') {
                        dq = !dq;
-               }else{
+               } else {
                        char* tmp = buf;
                        buf = __dw_strcat(tmp, cbuf);
                        free(tmp);

diff --git a/Library/util.c b/Library/util.c
index cf4b74fb16a483db8ace367d7a07ebbdf78f6856..b9c488e735a589ddc849350a10a38863dec1c3ba 100644 (file)
--- a/Library/util.c
+++ b/Library/util.c
@@ -1,7 +1,7 @@
 /* $Id$ */
 /* --- START LICENSE --- */
 /* -------------------------------------------------------------------------- */
-/* Copyright (c) 2024 Nishi.                                                  */
+/* Copyright (c) 2024 Crabware.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */
@@ -45,7 +45,7 @@ char* __dw_strdup(const char* a) {
        return str;
 }
 
-char* __dw_strcat(const char* a, const char* b){
+char* __dw_strcat(const char* a, const char* b) {
        char* str = malloc(strlen(a) + strlen(b) + 1);
        memcpy(str, a, strlen(a));
        memcpy(str + strlen(a), b, strlen(b));