strops format

1 files changed, 12 insertions, 13 deletions

diff --git a/src/administration.cpp b/src/administration.cpp
index 1de99b4..a3d3c2f 100644
--- a/src/administration.cpp
+++ b/src/administration.cpp
@@ -16,7 +16,6 @@
 
 #define _CRT_SECURE_NO_WARNINGS
 
-#include <string.h> 
 #include <stdlib.h>
 #include <assert.h>
 #include <time.h>
@@ -61,7 +60,7 @@ static void create_default_tax_rates()
     #define ADD_BRACKET(_country, _rate, _code)\
     {\
         tax_rate* tb = (tax_rate*)malloc(sizeof(tax_rate));\
-        snprintf(tb->id, sizeof(tb->id), "T/%d", create_id());\
+        strops::format(tb->id, sizeof(tb->id), "T/%d", create_id());\
         memcpy(tb->country_code, _country, sizeof(tb->country_code));\
         tb->rate = _rate;\
         memcpy(tb->category_code, _code, sizeof(tb->category_code));\
@@ -224,7 +223,7 @@ static void create_default_cost_centers()
     #define ADD_COSTCENTER(_description, _code)\
     {\
         cost_center* tb = (cost_center*)malloc(sizeof(cost_center));\
-        snprintf(tb->id, sizeof(tb->id), "E/%d", create_id());\
+        strops::format(tb->id, sizeof(tb->id), "E/%d", create_id());\
         memcpy(tb->description, _description, sizeof(tb->description));\
         memcpy(tb->code, _code, sizeof(tb->code));\
         list_append(&g_administration.cost_centers, tb);\
@@ -529,7 +528,7 @@ void administration::create_income_statement(income_statement* statement)
         quarter.report_count = 0;
         quarter.is_empty = 1;
         quarter.profit = 0.0f;
-        snprintf(quarter.quarter_str, MAX_LEN_SHORT_DESC, "%dQ%d", quarter.quarter+1, quarter.year);
+        strops::format(quarter.quarter_str, MAX_LEN_SHORT_DESC, "%dQ%d", quarter.quarter+1, quarter.year);
         
         project_count = administration::project_count();
         project* project_buffer = (project*)malloc(sizeof(project)*project_count);
@@ -913,7 +912,7 @@ contact administration::contact_create_empty()
 {
     contact result;
     memset(&result, 0, sizeof(contact));
-    snprintf(result.id, sizeof(result.id), "C/%d", create_id());
+    strops::format(result.id, sizeof(result.id), "C/%d", create_id());
     return result;
 }
 
@@ -1100,7 +1099,7 @@ project administration::project_create_empty()
     result.start_date = time(NULL);
     result.start_date -= (result.start_date % 86400);
     result.end_date = 0;
-    snprintf(result.id, sizeof(result.id), "P/%d", create_id());
+    strops::format(result.id, sizeof(result.id), "P/%d", create_id());
     return result;
 }
 
@@ -1111,8 +1110,8 @@ tax_rate administration::tax_rate_create_empty()
 {
     tax_rate result;
     memset(&result, 0, sizeof(tax_rate));
-    snprintf(result.id, sizeof(result.id), "T/%d", create_id());
-    snprintf(result.category_code, sizeof(result.category_code), "S"); // S = standard rate.
+    strops::format(result.id, sizeof(result.id), "T/%d", create_id());
+    strops::format(result.category_code, sizeof(result.category_code), "S"); // S = standard rate.
     return result;
 }
 
@@ -1125,7 +1124,7 @@ a_err administration::tax_rate_get_by_shorthandle(tax_rate* buffer, char* handle
         tax_rate c = *(tax_rate *)list_iterator_next(&g_administration.tax_rates);
 
         char compare_str[20];
-        snprintf(compare_str, 20, "%s/%.2f", c.country_code, c.rate);
+        strops::format(compare_str, 20, "%s/%.2f", c.country_code, c.rate);
         if (strcmp(compare_str, handle) == 0)
         {
             *buffer = c;
@@ -1273,7 +1272,7 @@ cost_center administration::cost_center_create_empty()
 {
     cost_center cc;
     memset(&cc, 0, sizeof(cost_center));
-    snprintf(cc.id, sizeof(cc.id), "E/%d", create_id());
+    strops::format(cc.id, sizeof(cc.id), "E/%d", create_id());
     return cc;
 }
 
@@ -1447,8 +1446,8 @@ invoice administration::invoice_create_empty()
 {
     invoice result;
     memset(&result, 0, sizeof(invoice));
-    snprintf(result.id, sizeof(result.id), "I/%d", create_id());
-    snprintf(result.sequential_number, sizeof(result.id), "INV%010d", create_sequence_number());
+    strops::format(result.id, sizeof(result.id), "I/%d", create_id());
+    strops::format(result.sequential_number, sizeof(result.id), "INV%010d", create_sequence_number());
     result.issued_at = time(NULL);
     result.issued_at -= (result.issued_at % 86400);
 
@@ -1951,7 +1950,7 @@ a_err administration::billing_item_add_to_invoice(invoice* invoice, billing_item
     if (!tb) return A_ERR_GENERIC;
     
     memcpy(tb, &item, sizeof(billing_item));
-    snprintf(tb->id, sizeof(tb->id), "B/%d", create_id());
+    strops::format(tb->id, sizeof(tb->id), "B/%d", create_id());
     strops::copy(tb->currency, invoice->currency, MAX_LEN_CURRENCY); // Set billing item currency to invoice currency.
     
     administration_recalculate_billing_item_totals(tb);