Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
SELinux: Trivial minor fixes that change C null character style
Trivial minor fixes that change C null character style.
Signed-off-by: Vesa-Matti Kari <vmkari@cc.helsinki.fi>
Signed-off-by: James Morris <jmorris@namei.org>
authored by
Vesa-Matti J Kari
and committed by
James Morris
df4ea865
3583a711
+18
-18
+1
-1
security/selinux/ss/conditional.c
+1
-1
security/selinux/ss/conditional.c
+7
-7
security/selinux/ss/mls.c
+7
-7
security/selinux/ss/mls.c
···
283
283
p++;
284
284
285
285
delim = *p;
286
-
if (delim != 0)
287
-
*p++ = 0;
286
+
if (delim != '\0')
287
+
*p++ = '\0';
288
288
289
289
for (l = 0; l < 2; l++) {
290
290
levdatum = hashtab_search(pol->p_levels.table, scontextp);
···
302
302
while (*p && *p != ',' && *p != '-')
303
303
p++;
304
304
delim = *p;
305
-
if (delim != 0)
306
-
*p++ = 0;
305
+
if (delim != '\0')
306
+
*p++ = '\0';
307
307
308
308
/* Separate into range if exists */
309
309
rngptr = strchr(scontextp, '.');
310
310
if (rngptr != NULL) {
311
311
/* Remove '.' */
312
-
*rngptr++ = 0;
312
+
*rngptr++ = '\0';
313
313
}
314
314
315
315
catdatum = hashtab_search(pol->p_cats.table,
···
357
357
p++;
358
358
359
359
delim = *p;
360
-
if (delim != 0)
361
-
*p++ = 0;
360
+
if (delim != '\0')
361
+
*p++ = '\0';
362
362
} else
363
363
break;
364
364
}
+10
-10
security/selinux/ss/policydb.c
+10
-10
security/selinux/ss/policydb.c
···
932
932
rc = next_entry(key, fp, len);
933
933
if (rc < 0)
934
934
goto bad;
935
-
key[len] = 0;
935
+
key[len] = '\0';
936
936
937
937
rc = hashtab_insert(h, key, perdatum);
938
938
if (rc)
···
979
979
rc = next_entry(key, fp, len);
980
980
if (rc < 0)
981
981
goto bad;
982
-
key[len] = 0;
982
+
key[len] = '\0';
983
983
984
984
for (i = 0; i < nel; i++) {
985
985
rc = perm_read(p, comdatum->permissions.table, fp);
···
1117
1117
rc = next_entry(key, fp, len);
1118
1118
if (rc < 0)
1119
1119
goto bad;
1120
-
key[len] = 0;
1120
+
key[len] = '\0';
1121
1121
1122
1122
if (len2) {
1123
1123
cladatum->comkey = kmalloc(len2 + 1, GFP_KERNEL);
···
1128
1128
rc = next_entry(cladatum->comkey, fp, len2);
1129
1129
if (rc < 0)
1130
1130
goto bad;
1131
-
cladatum->comkey[len2] = 0;
1131
+
cladatum->comkey[len2] = '\0';
1132
1132
1133
1133
cladatum->comdatum = hashtab_search(p->p_commons.table,
1134
1134
cladatum->comkey);
···
1201
1201
rc = next_entry(key, fp, len);
1202
1202
if (rc < 0)
1203
1203
goto bad;
1204
-
key[len] = 0;
1204
+
key[len] = '\0';
1205
1205
1206
1206
rc = ebitmap_read(&role->dominates, fp);
1207
1207
if (rc)
···
1262
1262
rc = next_entry(key, fp, len);
1263
1263
if (rc < 0)
1264
1264
goto bad;
1265
-
key[len] = 0;
1265
+
key[len] = '\0';
1266
1266
1267
1267
rc = hashtab_insert(h, key, typdatum);
1268
1268
if (rc)
···
1334
1334
rc = next_entry(key, fp, len);
1335
1335
if (rc < 0)
1336
1336
goto bad;
1337
-
key[len] = 0;
1337
+
key[len] = '\0';
1338
1338
1339
1339
rc = ebitmap_read(&usrdatum->roles, fp);
1340
1340
if (rc)
···
1388
1388
rc = next_entry(key, fp, len);
1389
1389
if (rc < 0)
1390
1390
goto bad;
1391
-
key[len] = 0;
1391
+
key[len] = '\0';
1392
1392
1393
1393
levdatum->level = kmalloc(sizeof(struct mls_level), GFP_ATOMIC);
1394
1394
if (!levdatum->level) {
···
1440
1440
rc = next_entry(key, fp, len);
1441
1441
if (rc < 0)
1442
1442
goto bad;
1443
-
key[len] = 0;
1443
+
key[len] = '\0';
1444
1444
1445
1445
rc = hashtab_insert(h, key, catdatum);
1446
1446
if (rc)
···
1523
1523
kfree(policydb_str);
1524
1524
goto bad;
1525
1525
}
1526
-
policydb_str[len] = 0;
1526
+
policydb_str[len] = '\0';
1527
1527
if (strcmp(policydb_str, POLICYDB_STRING)) {
1528
1528
printk(KERN_ERR "SELinux: policydb string %s does not match "
1529
1529
"my string %s\n", policydb_str, POLICYDB_STRING);