Skip to content

Commit 892faff

Browse files
committed
Fix warnings from NAN_INT macro
Add parentheses around arithmetic in operand of ‘|’ as the compiler suggested.
1 parent e94f613 commit 892faff

File tree

2 files changed

+9
-23
lines changed

2 files changed

+9
-23
lines changed

Diff for: expression.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#include "expression.h"
22

3-
#include <linux/kernel.h>
4-
#include <linux/module.h>
53
#include <linux/ctype.h> /* for isspace */
4+
#include <linux/kernel.h>
65
#include <linux/limits.h>
6+
#include <linux/module.h>
77
#include <linux/string.h>
8-
#define GET_NUM(n) (n >> 4)
9-
#define NAN_INT ((1 << 4) | (1 << 4) - 1)
10-
#define INF_INT ((1 << 5) | (1 << 4) - 1)
8+
#define GET_NUM(n) ((n) >> 4)
9+
#define NAN_INT ((1 << 4) | ((1 << 4) - 1))
10+
#define INF_INT ((1 << 5) | ((1 << 4) - 1))
1111
#define MASK(n) (((n) > 0) << 4)
1212
/*
1313
* lsb 4 byte for precision, 2^3, one for sign

Diff for: main.c

+4-18
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ static int dev_release(struct inode *, struct file *);
3434
static ssize_t dev_read(struct file *, char *, size_t, loff_t *);
3535
static ssize_t dev_write(struct file *, const char *, size_t, loff_t *);
3636

37-
static void prepare_calc(void);
38-
static void calc(int first, int second, operation_t op);
37+
static void calc(void);
3938

4039
static struct file_operations fops = {
4140
.open = dev_open,
@@ -100,30 +99,17 @@ static ssize_t dev_write(struct file *filep,
10099
size_of_message = strlen(message);
101100
printk(KERN_INFO "CALC: Received %d -> %s\n", size_of_message, message);
102101

103-
if (size_of_message >= 3) {
104-
prepare_calc();
105-
}
102+
calc();
106103
return len;
107104
}
108105

109-
static void handle_case(int *first_num_stop, int *sec_num_start, int i)
110-
{
111-
if (first_num_stop && *first_num_stop == 0) {
112-
*first_num_stop = i - 1;
113-
}
114-
115-
if (sec_num_start && *sec_num_start == 0) {
116-
*sec_num_start = i + 1;
117-
}
118-
}
119-
120-
static void prepare_calc(void)
106+
static void calc(void)
121107
{
122108
struct expr_var_list vars = {0};
123109
struct expr *e = expr_create(message, strlen(message), &vars, NULL);
124110
if (!e) {
125111
printk(KERN_ALERT "Syntax error");
126-
return 1;
112+
return;
127113
}
128114

129115
result = expr_eval(e);

0 commit comments

Comments
 (0)