aboutsummaryrefslogtreecommitdiff
path: root/ch5/5-10_expr.c
diff options
context:
space:
mode:
authorzlg <zlg@zlg.space>2016-06-16 10:15:33 -0700
committerzlg <zlg@zlg.space>2016-06-16 10:15:33 -0700
commitf8d9ff23eb8d3e3286ff5cf4d5f9493532991bb7 (patch)
treee37b327d7f93435e93a57427600d2b91fbb0cd87 /ch5/5-10_expr.c
parentSolve Exercise 7-2: Format arbitrary input (diff)
downloadknr-f8d9ff23eb8d3e3286ff5cf4d5f9493532991bb7.tar.gz
knr-f8d9ff23eb8d3e3286ff5cf4d5f9493532991bb7.tar.bz2
knr-f8d9ff23eb8d3e3286ff5cf4d5f9493532991bb7.tar.xz
knr-f8d9ff23eb8d3e3286ff5cf4d5f9493532991bb7.zip
The massive astyle sweep!
Code style should be consistent now. All future commits will be run through astyle or they will be amended.
Diffstat (limited to '')
-rw-r--r--ch5/5-10_expr.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/ch5/5-10_expr.c b/ch5/5-10_expr.c
index cc88838..acaabca 100644
--- a/ch5/5-10_expr.c
+++ b/ch5/5-10_expr.c
@@ -27,7 +27,7 @@ double pop(void);
* calculator. Note that for most shells, you'll need to escape the
* multiplication symbol (*) or it will expand to every file in the current
* directory; NOT what you want in this situation. :)
- *
+ *
* So if you want 6 × 8 for example, you'll need to type `6 8 \*`
*/
int main(int argc, char *argv[]) {
@@ -35,7 +35,7 @@ int main(int argc, char *argv[]) {
double op2;
for (argp = 1; argp < argc; argp++) {
int argtype = opt_type(argv[argp]);
- switch(argtype) {
+ switch (argtype) {
case '*':
push(pop() * pop());
break;
@@ -80,7 +80,7 @@ double pop(void) {
int opt_type(char op[]) {
int i = 0;
- switch(op[i]) {
+ switch (op[i]) {
case '*':
return '*';
case '+':
@@ -88,12 +88,11 @@ int opt_type(char op[]) {
case '/':
return '/';
case '-':
- if (op[i+1] == '\0') {
+ if (op[i + 1] == '\0') {
return '-';
}
break;
}
-
while (isdigit(op[i])) {
i++;
}