Skip to content

Commit 2a05b80

Browse files
links234links234
committed
qr: code cleanup
1 parent e8e86a4 commit 2a05b80

15 files changed

Lines changed: 1111 additions & 1085 deletions

File tree

‎include/linux/qrencode.h‎

Lines changed: 105 additions & 105 deletions
Large diffs are not rendered by default.

‎kernel/print_oops.c‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define QQQ_BLACK 0x00
2828

2929
static int qr_oops = 1;
30-
core_param(qr_oops, qr_oops, int, 0644);
30+
core_param(qr_oops, qr_oops, int, 0644);
3131

3232
static char qr_buffer[QR_BUFSIZE];
3333
static int buf_pos;
@@ -135,7 +135,7 @@ void print_qr_err(void)
135135
ssize_t compr_len;
136136
struct fb_info *info;
137137
struct fb_fillrect rect;
138-
struct QRcode *qr;
138+
struct qrcode *qr;
139139
int i, j;
140140
int w;
141141
int is_black;
@@ -165,7 +165,7 @@ void print_qr_err(void)
165165
return;
166166
}
167167

168-
qr = QRcode_encodeData(compr_len, compr_qr_buffer, 0, QR_ECLEVEL_H);
168+
qr = qrcode_encode_data(compr_len, compr_qr_buffer, 0, QR_ECLEVEL_H);
169169
if (!qr) {
170170
printk(KERN_EMERG "Failed to encode data as a QR code!\n");
171171
return;
@@ -229,9 +229,8 @@ void print_qr_err(void)
229229
}
230230
}
231231

232-
QRcode_free(qr);
232+
qrcode_free(qr);
233233
qr_compr_exit();
234234
buf_pos = 0;
235235
bug_in_code --;
236236
}
237-

‎lib/qr/bitstream.c‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* BitStream - storage of bits to which you can append
2+
* bit_stream - storage of bits to which you can append
33
*
44
* Copyright (C) 2014 Levente Kurusa <levex@linux.com>
55
*
@@ -21,14 +21,14 @@
2121

2222
#define BITS_TO_BYTES(x) (((x) % 8) ? ((x) / 8 + 1) : ((x) / 8))
2323

24-
u8 *__BitStream_alloc_data(int len, gfp_t gfp)
24+
u8 *__bit_stream_alloc_data(int len, gfp_t gfp)
2525
{
2626
return kzalloc(BITS_TO_BYTES(len), gfp);
2727
}
2828

29-
struct BitStream *BitStream_allocate(int space, gfp_t gfp)
29+
struct bit_stream *bit_stream_allocate(int space, gfp_t gfp)
3030
{
31-
struct BitStream *bstr;
31+
struct bit_stream *bstr;
3232
u8 *bitmap;
3333

3434
/* XXX */
@@ -43,7 +43,7 @@ struct BitStream *BitStream_allocate(int space, gfp_t gfp)
4343
if (space == 0)
4444
return bstr;
4545

46-
bitmap = __BitStream_alloc_data(space, gfp);
46+
bitmap = __bit_stream_alloc_data(space, gfp);
4747
if (!bitmap) {
4848
kfree(bstr);
4949
return NULL;
@@ -55,20 +55,20 @@ struct BitStream *BitStream_allocate(int space, gfp_t gfp)
5555
return bstr;
5656
}
5757

58-
struct BitStream *BitStream_new(void)
58+
struct bit_stream *bit_stream_new(void)
5959
{
60-
return BitStream_allocate(128, GFP_ATOMIC);
60+
return bit_stream_allocate(128, GFP_ATOMIC);
6161
}
6262

63-
void BitStream_free(struct BitStream *bstr)
63+
void bit_stream_free(struct bit_stream *bstr)
6464
{
6565
if (!bstr)
6666
return;
6767
kfree(bstr->data);
6868
kfree(bstr);
6969
}
7070

71-
int BitStream_resize(struct BitStream *bstr, int nspace)
71+
int bit_stream_resize(struct bit_stream *bstr, int nspace)
7272
{
7373
unsigned char *data;
7474

@@ -92,20 +92,20 @@ int BitStream_resize(struct BitStream *bstr, int nspace)
9292
return 0;
9393
}
9494

95-
int __BitStream_get_bit(struct BitStream *bstr, int no)
95+
int __bit_stream_get_bit(struct bit_stream *bstr, int no)
9696
{
9797
if (WARN_ON(no > bstr->length))
9898
return 0;
9999

100100
return (bstr->data[no / 8] & (1 << (no % 8))) ? 1 : 0;
101101
}
102102

103-
int __BitStream_append_bit(struct BitStream *bstr, u8 bit)
103+
int __bit_stream_append_bit(struct bit_stream *bstr, u8 bit)
104104
{
105105
int rc;
106106

107107
if (!bstr->data || bstr->length + 1 >= bstr->space) {
108-
rc = BitStream_resize(bstr, bstr->space + 256);
108+
rc = bit_stream_resize(bstr, bstr->space + 256);
109109
if (rc)
110110
return rc;
111111
}
@@ -120,7 +120,7 @@ int __BitStream_append_bit(struct BitStream *bstr, u8 bit)
120120
return 0;
121121
}
122122

123-
int BitStream_appendBytes(struct BitStream *bstr, int bytes, u8 *data)
123+
int bit_stream_append_bytes(struct bit_stream *bstr, int bytes, u8 *data)
124124
{
125125
int rc;
126126
int i, j;
@@ -129,7 +129,7 @@ int BitStream_appendBytes(struct BitStream *bstr, int bytes, u8 *data)
129129
for (i = 0; i < bytes; i++) {
130130
mask = 0x80;
131131
for (j = 0; j < 8; j++) {
132-
rc = __BitStream_append_bit(bstr, data[i] & mask);
132+
rc = __bit_stream_append_bit(bstr, data[i] & mask);
133133
if (rc)
134134
return rc;
135135
mask = mask >> 1;
@@ -139,15 +139,15 @@ int BitStream_appendBytes(struct BitStream *bstr, int bytes, u8 *data)
139139
return 0;
140140
}
141141

142-
int BitStream_appendNum(struct BitStream *bstr, int bits, int num)
142+
int bit_stream_append_num(struct bit_stream *bstr, int bits, int num)
143143
{
144144
int rc;
145145
int i;
146146
unsigned int mask;
147147

148148
mask = 1 << (bits - 1);
149149
for (i = 0; i < bits; i++) {
150-
rc = __BitStream_append_bit(bstr, num & mask);
150+
rc = __bit_stream_append_bit(bstr, num & mask);
151151
if (rc)
152152
return rc;
153153
mask = mask >> 1;
@@ -156,35 +156,35 @@ int BitStream_appendNum(struct BitStream *bstr, int bits, int num)
156156
return 0;
157157
}
158158

159-
int BitStream_append(struct BitStream *dst, struct BitStream *src)
159+
int bit_stream_append(struct bit_stream *dst, struct bit_stream *src)
160160
{
161161
int rc, i;
162162

163163
for (i = 0; i < src->length; i++) {
164-
rc = __BitStream_append_bit(dst, __BitStream_get_bit(src, i));
164+
rc = __bit_stream_append_bit(dst, __bit_stream_get_bit(src, i));
165165
if (rc)
166166
return rc;
167167
}
168168

169169
return 0;
170170
}
171171

172-
unsigned char *BitStream_toByte(struct BitStream *bstr)
172+
unsigned char *bit_stream_to_byte(struct bit_stream *bstr)
173173
{
174174
unsigned char *data, v;
175175
int i, j, size, bytes, p;
176176

177177
data = kzalloc((bstr->length + 7) / 8, bstr->gfp);
178178
if (!data)
179179
return NULL;
180-
size = BitStream_size(bstr);
180+
size = bit_stream_size(bstr);
181181
bytes = size / 8;
182182
p = 0;
183183
for (i = 0; i < bytes; i++) {
184184
v = 0;
185185
for (j = 0; j < 8; j++) {
186186
v = v << 1;
187-
v |= __BitStream_get_bit(bstr, p);
187+
v |= __bit_stream_get_bit(bstr, p);
188188
p++;
189189
}
190190
data[i] = v;
@@ -193,7 +193,7 @@ unsigned char *BitStream_toByte(struct BitStream *bstr)
193193
v = 0;
194194
for (j = 0; j < (size & 7); j++) {
195195
v = v << 1;
196-
v |= __BitStream_get_bit(bstr, p);
196+
v |= __bit_stream_get_bit(bstr, p);
197197
p++;
198198
}
199199
data[bytes] = v;

‎lib/qr/bitstream.h‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* BitStream - storage of bits to which you can append
2+
* bit_stream - storage of bits to which you can append
33
*
44
* Copyright (C) 2014 Levente Kurusa <levex@linux.com>
55
*
@@ -21,22 +21,21 @@
2121
#include <linux/gfp.h>
2222
#include <linux/spinlock.h>
2323

24-
struct BitStream {
24+
struct bit_stream {
2525
u8 *data;
2626
int length;
2727
int space;
2828
gfp_t gfp;
2929
};
3030

31-
extern struct BitStream *BitStream_allocate(int length, gfp_t gfp);
32-
extern struct BitStream *BitStream_new(void);
33-
extern void BitStream_free(struct BitStream *bstr);
34-
extern int BitStream_appendBytes(struct BitStream *bstr, int len, u8 *data);
35-
extern int BitStream_appendNum(struct BitStream *bstr, int bits, int num);
36-
extern int BitStream_append(struct BitStream *dst, struct BitStream *src);
37-
extern unsigned char *BitStream_toByte(struct BitStream *bstr);
38-
39-
#define BitStream_size(b) (b->length)
31+
struct bit_stream *bit_stream_allocate(int length, gfp_t gfp);
32+
struct bit_stream *bit_stream_new(void);
33+
void bit_stream_free(struct bit_stream *bstr);
34+
int bit_stream_append_bytes(struct bit_stream *bstr, int len, u8 *data);
35+
int bit_stream_append_num(struct bit_stream *bstr, int bits, int num);
36+
int bit_stream_append(struct bit_stream *dst, struct bit_stream *src);
37+
unsigned char *bit_stream_to_byte(struct bit_stream *bstr);
4038

39+
#define bit_stream_size(b) (b->length)
4140

4241
#endif /* __BITSTREAM_H */

0 commit comments

Comments
 (0)