diff --git a/calc.c b/calc.c index 85f1466..edf6cbd 100644 --- a/calc.c +++ b/calc.c @@ -3,31 +3,32 @@ int main(){ FILE *fp = NULL; - int operand1, operand2; + double operand1, operand2; char operator = ' '; - int result, line = 0; + double (* result)(double, double); + double line = 0; fp = fopen("read.txt","r"); if(fp!=NULL){ - fscanf(fp, "%d", &line); + fscanf(fp, "%lf", &line); for(int i=0; i + +void my_scanf)FILE *fp, const char *format, ..); + +#endif /* !MY_FSCANF_H */ + diff --git a/my_fscanf.c b/my_fscanf.c new file mode 100644 index 0000000..d978cdd --- /dev/null +++ b/my_fscanf.c @@ -0,0 +1,16 @@ +#include "my_fscanf.h" +#include +#include +void my_fscanf(FILE *fp, const char *format, ...) { + va_list list; + va_start(list, format); + while(*format) { + if(*format == '%') { + format++; + switch(*format) { + } + } + } + va_end(list); +} + diff --git a/my_fscanf.h b/my_fscanf.h new file mode 100644 index 0000000..100013e --- /dev/null +++ b/my_fscanf.h @@ -0,0 +1,8 @@ +#ifndef MY_FSCANF_H +#define MY_FSCANF_H +#include + +void my_fscanf(FILE *fp, const char *format, ...); + +#endif /* !MY_FSCANF_H*/ + diff --git a/operators.c b/operators.c index d51cb3e..34999cd 100644 --- a/operators.c +++ b/operators.c @@ -1,16 +1,16 @@ #include "operators.h" -int add(int op1, int op2) { +double add(double op1, double op2) { return op1+op2; } -int minus(int op1, int op2) { +double minus(double op1, double op2) { return op1-op2; } -int mul(int op1, int op2) { +double mul(double op1, double op2) { return op1*op2; } -int div(int op1, int op2) { - return op1%op2; +double div(double op1, double op2) { + return op1/op2; } diff --git a/operators.h b/operators.h index bd08f7d..0172ff3 100644 --- a/operators.h +++ b/operators.h @@ -1,4 +1,4 @@ -int add(int op1, int op2); -int mul(int op1, int op2); -int div(int op1, int op2); -int minus(int op1, int op2); +double add(double op1, double op2); +double mul(double op1, double op2); +double div(double op1, double op2); +double minus(double op1, double op2);