aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorvapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-02-19 22:59:12 +0000
committervapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-02-19 22:59:12 +0000
commitad39b4e5b8fa18e988ac0c086fe329f43f7b7884 (patch)
tree2f1353c65e19834a43d3b78cff26801a971cf2b6 /libbb
parentb4244f836731d0a566f91553bf65fbd30a4455e9 (diff)
downloadbusybox-w32-ad39b4e5b8fa18e988ac0c086fe329f43f7b7884.tar.gz
busybox-w32-ad39b4e5b8fa18e988ac0c086fe329f43f7b7884.tar.bz2
busybox-w32-ad39b4e5b8fa18e988ac0c086fe329f43f7b7884.zip
rfelker writes in Bug 740: s/u_char/unsigned char/
git-svn-id: svn://busybox.net/trunk/busybox@14134 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb')
-rw-r--r--libbb/dump.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/libbb/dump.c b/libbb/dump.c
index 09db24692..c09abf8c4 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -352,18 +352,18 @@ static int next(char **argv)
352 /* NOTREACHED */ 352 /* NOTREACHED */
353} 353}
354 354
355static u_char *get(void) 355static unsigned char *get(void)
356{ 356{
357 static int ateof = 1; 357 static int ateof = 1;
358 static u_char *curp=NULL, *savp; /*DBU:[dave@cray.com]initialize curp */ 358 static unsigned char *curp=NULL, *savp; /*DBU:[dave@cray.com]initialize curp */
359 register int n; 359 register int n;
360 int need, nread; 360 int need, nread;
361 u_char *tmpp; 361 unsigned char *tmpp;
362 362
363 if (!curp) { 363 if (!curp) {
364 address = (off_t)0; /*DBU:[dave@cray.com] initialize,initialize..*/ 364 address = (off_t)0; /*DBU:[dave@cray.com] initialize,initialize..*/
365 curp = (u_char *) xmalloc(bb_dump_blocksize); 365 curp = (unsigned char *) xmalloc(bb_dump_blocksize);
366 savp = (u_char *) xmalloc(bb_dump_blocksize); 366 savp = (unsigned char *) xmalloc(bb_dump_blocksize);
367 } else { 367 } else {
368 tmpp = curp; 368 tmpp = curp;
369 curp = savp; 369 curp = savp;
@@ -378,19 +378,19 @@ static u_char *get(void)
378 */ 378 */
379 if (!bb_dump_length || (ateof && !next((char **) NULL))) { 379 if (!bb_dump_length || (ateof && !next((char **) NULL))) {
380 if (need == bb_dump_blocksize) { 380 if (need == bb_dump_blocksize) {
381 return ((u_char *) NULL); 381 return ((unsigned char *) NULL);
382 } 382 }
383 if (bb_dump_vflag != ALL && !bcmp(curp, savp, nread)) { 383 if (bb_dump_vflag != ALL && !bcmp(curp, savp, nread)) {
384 if (bb_dump_vflag != DUP) { 384 if (bb_dump_vflag != DUP) {
385 printf("*\n"); 385 printf("*\n");
386 } 386 }
387 return ((u_char *) NULL); 387 return ((unsigned char *) NULL);
388 } 388 }
389 memset((char *) curp + nread, 0, need); 389 memset((char *) curp + nread, 0, need);
390 eaddress = address + nread; 390 eaddress = address + nread;
391 return (curp); 391 return (curp);
392 } 392 }
393 n = fread((char *) curp + nread, sizeof(u_char), 393 n = fread((char *) curp + nread, sizeof(unsigned char),
394 bb_dump_length == -1 ? need : MIN(bb_dump_length, need), stdin); 394 bb_dump_length == -1 ? need : MIN(bb_dump_length, need), stdin);
395 if (!n) { 395 if (!n) {
396 if (ferror(stdin)) { 396 if (ferror(stdin)) {
@@ -451,7 +451,7 @@ static const char conv_str[] =
451 "\0"; 451 "\0";
452 452
453 453
454static void conv_c(PR * pr, u_char * p) 454static void conv_c(PR * pr, unsigned char * p)
455{ 455{
456 const char *str = conv_str; 456 const char *str = conv_str;
457 char buf[10]; 457 char buf[10];
@@ -476,7 +476,7 @@ static void conv_c(PR * pr, u_char * p)
476 } 476 }
477} 477}
478 478
479static void conv_u(PR * pr, u_char * p) 479static void conv_u(PR * pr, unsigned char * p)
480{ 480{
481 static const char list[] = 481 static const char list[] =
482 "nul\0soh\0stx\0etx\0eot\0enq\0ack\0bel\0" 482 "nul\0soh\0stx\0etx\0eot\0enq\0ack\0bel\0"
@@ -507,10 +507,10 @@ static void display(void)
507 register FU *fu; 507 register FU *fu;
508 register PR *pr; 508 register PR *pr;
509 register int cnt; 509 register int cnt;
510 register u_char *bp; 510 register unsigned char *bp;
511 511
512 off_t saveaddress; 512 off_t saveaddress;
513 u_char savech = 0, *savebp; 513 unsigned char savech = 0, *savebp;
514 514
515 while ((bp = get()) != NULL) { 515 while ((bp = get()) != NULL) {
516 for (fs = bb_dump_fshead, savebp = bp, saveaddress = address; fs; 516 for (fs = bb_dump_fshead, savebp = bp, saveaddress = address; fs;