From 92f6a8fa81a5a6e1bc746e1ef7e50bdf11b34a47 Mon Sep 17 00:00:00 2001 From: q-posev Date: Tue, 23 Feb 2021 18:18:20 +0100 Subject: [PATCH] replaced some ints with unsigned ints --- src/trio_text.c | 22 +++++++++++----------- src/trio_text.h | 10 +++++----- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/trio_text.c b/src/trio_text.c index a75d304..6a2313d 100644 --- a/src/trio_text.c +++ b/src/trio_text.c @@ -82,7 +82,7 @@ nucleus_t* trio_text_read_nucleus(const trio_text_t* file) { fscanf(f, "%s", buffer); assert (strcmp(buffer, "num") == 0); - fscanf(f, "%ld", &(nucleus->num)); + fscanf(f, "%lu", &(nucleus->num)); assert (nucleus->num > 0); /* Allocate arrays */ @@ -96,14 +96,14 @@ nucleus_t* trio_text_read_nucleus(const trio_text_t* file) { fscanf(f, "%s", buffer); assert (strcmp(buffer, "charge") == 0); - for (int i=0 ; inum ; i++) { + for (size_t i=0 ; inum ; i++) { fscanf(f, "%lf", &(nucleus->charge[i])); } fscanf(f, "%s", buffer); assert (strcmp(buffer, "coord") == 0); - for (int i=0 ; i<3*nucleus->num ; i++) { + for (size_t i=0 ; i<3*nucleus->num ; i++) { fscanf(f, "%lf", &(nucleus->coord[i])); } free(buffer); @@ -123,12 +123,12 @@ trio_exit_code trio_text_write_nucleus(const trio_text_t* file, nucleus_t* nucle /* Write arrays */ fprintf(f, "charge\n"); - for (int i=0 ; inum ; i++) { + for (size_t i=0 ; inum ; i++) { fprintf(f, "%lf\n", nucleus->charge[i]); } fprintf(f, "coord\n"); - for (int i=0 ; i<3*nucleus->num ; i++) { + for (size_t i=0 ; i<3*nucleus->num ; i++) { fprintf(f, "%lf\n", nucleus->coord[i]); } @@ -156,7 +156,7 @@ trio_exit_code trio_text_free_nucleus(nucleus_t* nucleus) { return TRIO_SUCCESS; } -trio_exit_code trio_text_read_nucleus_num(const trio_t* file, int64_t* num) { +trio_exit_code trio_text_read_nucleus_num(const trio_t* file, uint64_t* num) { assert (file != NULL); assert (num != NULL); @@ -174,7 +174,7 @@ trio_exit_code trio_text_read_nucleus_num(const trio_t* file, int64_t* num) { } -trio_exit_code trio_text_write_nucleus_num(const trio_t* file, const int64_t num) { +trio_exit_code trio_text_write_nucleus_num(const trio_t* file, const uint64_t num) { assert (num > 0L); assert (file != NULL); @@ -223,7 +223,7 @@ trio_exit_code trio_text_read_nucleus_coord(const trio_t* file, double* coord) { assert (coord != NULL); - for (int i=0 ; i<3*nucleus->num ; i++) { + for (size_t i=0 ; i<3*nucleus->num ; i++) { coord[i] = nucleus->coord[i]; } @@ -240,7 +240,7 @@ trio_exit_code trio_text_write_nucleus_coord(const trio_t* file, const double* c nucleus_t* nucleus = trio_text_read_nucleus((trio_text_t*) file); assert (nucleus != NULL); - for (int i=0 ; i<3*nucleus->num ; i++) { + for (size_t i=0 ; i<3*nucleus->num ; i++) { nucleus->coord[i] = coord[i]; } @@ -264,7 +264,7 @@ trio_exit_code trio_text_read_nucleus_charge(const trio_t* file, double* charge) assert (charge != NULL); - for (int i=0 ; inum ; i++) { + for (size_t i=0 ; inum ; i++) { charge[i] = nucleus->charge[i]; } @@ -281,7 +281,7 @@ trio_exit_code trio_text_write_nucleus_charge(const trio_t* file, const double* nucleus_t* nucleus = trio_text_read_nucleus((trio_text_t*)file); assert (nucleus != NULL); - for (int i=0 ; inum ; i++) { + for (size_t i=0 ; inum ; i++) { nucleus->charge[i] = charge[i]; } diff --git a/src/trio_text.h b/src/trio_text.h index feca94a..c52f8de 100644 --- a/src/trio_text.h +++ b/src/trio_text.h @@ -20,12 +20,12 @@ typedef struct nucleus_s { double* coord; double* charge; - int64_t num; + uint64_t num; } nucleus_t; typedef struct electron_s { - int64_t alpha_num; - int64_t beta_num; + uint64_t alpha_num; + uint64_t beta_num; } electron_t; typedef struct trio_text_s { @@ -38,8 +38,8 @@ trio_exit_code trio_text_init(trio_t* file); trio_exit_code trio_text_finalize(trio_t* file); -trio_exit_code trio_text_read_nucleus_num(const trio_t* file, int64_t* num); -trio_exit_code trio_text_write_nucleus_num(const trio_t* file, const int64_t num); +trio_exit_code trio_text_read_nucleus_num(const trio_t* file, uint64_t* num); +trio_exit_code trio_text_write_nucleus_num(const trio_t* file, const uint64_t num); trio_exit_code trio_text_read_nucleus_coord(const trio_t* file, double* coord); trio_exit_code trio_text_write_nucleus_coord(const trio_t* file, const double* coord);