test: drop duplicate account code

diff --git a/config/account.c b/config/account.c
index 20095f75866bc1ad9cdb95fcdcf1faed5c079983..f140aee53f14eeeb562be43052d5e93600c32918 100644 (file)
--- a/config/account.c
+++ b/config/account.c
@@ -146,7 +146,7 @@ int ac_set_value(const struct Account *ac, size_t vid, intptr_t value, struct Bu
 }
 
 /**
- * ac_get_value - Get an Account-specific config item
+ * ac_get_value - Get an account-specific config item
  * @param ac     Account-specific config items
  * @param vid    Value ID (index into Account's HashElem's)
  * @param result Buffer for results or error messages

diff --git a/config/account.h b/config/account.h
index db15ba3c4c6352712b0bb749ede0fc524247722c..f6824f9528a27f5db298b0896ccc10eb0516af94 100644 (file)
--- a/config/account.h
+++ b/config/account.h
@@ -36,7 +36,7 @@ struct Account
   char *name;                 /**< Name of Account */
   const struct ConfigSet *cs; /**< Parent ConfigSet */
   const char **var_names;     /**< Array of the names of local config items */
-  int num_vars;               /**< Number of local config items */
+  size_t num_vars;            /**< Number of local config items */
   struct HashElem **vars;     /**< Array of the HashElems of local config items */
 };
 

diff --git a/config/inheritance.h b/config/inheritance.h
index 02ccf89e9bbbec09164b7e63fddb69b1868d34a5..f5aadf5d0ecf77a5a09eca3164a6f951e3f4bc3c 100644 (file)
--- a/config/inheritance.h
+++ b/config/inheritance.h
@@ -32,7 +32,7 @@ struct Inheritance
 {
   struct HashElem *parent; /**< HashElem of parent config item */
   const char *name;        /**< Name of this config item */
-  struct Account *ac;      /**< Account holding this config item */
+  struct Account *ac;   /**< Account holding this config item */
   intptr_t var;            /**< (Pointer to) value, of config item */
 };
 

diff --git a/test/config/account.c b/test/config/account.c
index c634f480ede7eb25178500ca03ec67702719b73a..935d2002920c480a91e112dee35d3404cdd0a8f2 100644 (file)
--- a/test/config/account.c
+++ b/test/config/account.c
@@ -26,7 +26,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
-#include "config/account.h"
 #include "config/common.h"
 #include "config/lib.h"
 

diff --git a/test/config/account.h b/test/config/account.h
deleted file mode 100644 (file)
index 8e53bb5..0000000
--- a/test/config/account.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * @file
- * A collection of account-specific config items
- *
- * @authors
- * Copyright (C) 2017-2018 Richard Russon <rich@flatcap.org>
- *
- * @copyright
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 2 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _CONFIG_ACCOUNT_H
-#define _CONFIG_ACCOUNT_H
-
-#include <stdint.h>
-
-struct Buffer;
-struct ConfigSet;
-
-/**
- * struct Account - Account-local config items
- */
-struct Account
-{
-  char *name;                 /**< Name of Account */
-  const struct ConfigSet *cs; /**< Parent ConfigSet */
-  const char **var_names;     /**< Array of the names of local config items */
-  size_t num_vars;            /**< Number of local config items */
-  struct HashElem **vars;     /**< Array of the HashElems of local config items */
-};
-
-struct Account *ac_create(const struct ConfigSet *cs, const char *name, const char *var_names[]);
-void ac_free(const struct ConfigSet *cs, struct Account **ac);
-
-int ac_set_value(const struct Account *ac, size_t vid, intptr_t value, struct Buffer *err);
-int ac_get_value(const struct Account *ac, size_t vid, struct Buffer *err);
-
-#endif /* _CONFIG_ACCOUNT_H */

diff --git a/test/config/address.c b/test/config/address.c
index e57d9734e0ce5b78381303ba93b69b628f1a00f2..87f2a3ebab9586bc18d4fa658f2d2a771ce2964b 100644 (file)
--- a/test/config/address.c
+++ b/test/config/address.c
@@ -28,7 +28,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
-#include "config/account.h"
 #include "config/common.h"
 #include "config/lib.h"
 #include "email/address.h"

diff --git a/test/config/bool.c b/test/config/bool.c
index ced8cdb9225ef1355b53ea63ad66c85fbf5ca66a..477b5f2037f3f563ead044a018d86d38fb4dcff9 100644 (file)
--- a/test/config/bool.c
+++ b/test/config/bool.c
@@ -28,7 +28,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
-#include "config/account.h"
 #include "config/common.h"
 #include "config/lib.h"
 

diff --git a/test/config/command.c b/test/config/command.c
index edf1ec0616da731e32bdea8d6073437fecae1de2..3f7b1dddf19f1fcae978402f2d61a716dbcef919 100644 (file)
--- a/test/config/command.c
+++ b/test/config/command.c
@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
-#include "config/account.h"
 #include "config/common.h"
 #include "config/lib.h"
 

diff --git a/test/config/long.c b/test/config/long.c
index 8160058828cbc53efce8b4734e276c58631bd599..7b7aefd328e03753b9882cfe715b19a1e5172a20 100644 (file)
--- a/test/config/long.c
+++ b/test/config/long.c
@@ -28,7 +28,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
-#include "config/account.h"
 #include "config/common.h"
 #include "config/lib.h"
 

diff --git a/test/config/magic.c b/test/config/magic.c
index 7ed0cab3fa1832a8d60d054396b276fc628450d1..f981e83b7641db7099f0c54a33bac94bc98c3580 100644 (file)
--- a/test/config/magic.c
+++ b/test/config/magic.c
@@ -28,7 +28,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
-#include "config/account.h"
 #include "config/common.h"
 #include "config/lib.h"
 

diff --git a/test/config/mbtable.c b/test/config/mbtable.c
index 4da1c46cfdf910d7d6d9092ef40f869f7628ceaf..1f7923616e474b66bdcc7b08bacc6785a006b01b 100644 (file)
--- a/test/config/mbtable.c
+++ b/test/config/mbtable.c
@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
-#include "config/account.h"
 #include "config/common.h"
 #include "config/lib.h"
 

diff --git a/test/config/number.c b/test/config/number.c
index 536aa558928aa241331c7dc4fe5eff9365679eef..53e8f0d8983f40b17b08b295fe8fb44fa647e37e 100644 (file)
--- a/test/config/number.c
+++ b/test/config/number.c
@@ -28,7 +28,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
-#include "config/account.h"
 #include "config/common.h"
 #include "config/lib.h"
 

diff --git a/test/config/path.c b/test/config/path.c
index 25396f3650e04441dae87d64a5f46d756b0d11cd..6a81fe059b75ba41bb6524cb8cf4e786d84a90f4 100644 (file)
--- a/test/config/path.c
+++ b/test/config/path.c
@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
-#include "config/account.h"
 #include "config/common.h"
 #include "config/lib.h"
 

diff --git a/test/config/quad.c b/test/config/quad.c
index a5b1952ddbda855b5d167c932d71071fcc025848..b2e2ab2b86d7cf965a49120ad7b88ba478ab8a0a 100644 (file)
--- a/test/config/quad.c
+++ b/test/config/quad.c
@@ -28,7 +28,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
-#include "config/account.h"
 #include "config/common.h"
 #include "config/lib.h"
 

diff --git a/test/config/regex.c b/test/config/regex.c
index 6d247bc04bf0c88c8fe9c0aa6486225373b46e47..f7db0aa9a335b06b64ee71a3a3b052213154f694 100644 (file)
--- a/test/config/regex.c
+++ b/test/config/regex.c
@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
-#include "config/account.h"
 #include "config/common.h"
 #include "config/lib.h"
 

diff --git a/test/config/sort.c b/test/config/sort.c
index 00f891c379150273067d0f8a2ce896c5a0465530..1409b4e1fd3ba874867decf3a24484d46402ae6a 100644 (file)
--- a/test/config/sort.c
+++ b/test/config/sort.c
@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
-#include "config/account.h"
 #include "config/common.h"
 #include "config/lib.h"
 

diff --git a/test/config/string.c b/test/config/string.c
index fa22eb49dce412291133e14f26382d01fde9339e..37fc451ff3c6171b168f90760394b8acf76caeb0 100644 (file)
--- a/test/config/string.c
+++ b/test/config/string.c
@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
-#include "config/account.h"
 #include "config/common.h"
 #include "config/lib.h"