|
[openbeos-preferences]
||
[Date Prev]
[11-2003 Date Index]
[Date Next]
||
[Thread Prev]
[11-2003 Thread Index]
[Thread Next]
[openbeos-preferences] bin cleanup (#2)
- From: "Niels Reedijk" <n.reedijk@xxxxxxxxx>
- To: openbeos-preferences@xxxxxxxxxxxxx
- Date: Sun, 30 Nov 2003 17:47:43 GMT
Here's the complete /bin cleanup.
I've cleaned up most of the warnings except some in the gnu utilities,
and some I haven't yet
understood. For completeness I included the complete changelog of the
bin-applications--fixes tree, and a complete diff. All the changes are
trivial and shouldn't (and probably couldn't) effect the working of the
programs. Can someone (sikosis) give me the green light?
(I haven't found out how to do the diffs with arch yet, so I'm just
sticking to the cvs diff now)
Niels
patch-1
Fix warning
patch-2
Fix warning in roster.cpp
patch-3
Fix warning in clipboard.cpp
patch-4
Fix warning in shutdown.cpp (trivial)
patch-5
Fix warnings in chop.c (trivial)
patch-6
Trivial warning fix in eject.c
patch-7
Trivial warning fix in hd.c
patch-8
Trivial warning fixes in listarea.c
patch-9
TRIVIAL: Fix warning in listimage.c
patch-10
TRIVIAL warning fix in listport.c
patch-11
TRIVIAL fix in listsem.c
patch-12
TRIVIAL fix in mount.c
patch-13
Trivial fix in prio.c
patch-14
TRIVIAL changes in ps.c
patch-15
TRIVIAL fix in renice.c
patch-16
TRIVIAL fix for rescan
patch-17
TRIVIAL fix in sysinfo.c
patch-18
TRIVIAL fix in unchop.c
patch-19
TRIVIAL fix in chkbfs
patch-20
TRIVIAL fixes for listdev
patch-21
TRIVIAL fixes in pc
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/chop.c,v
retrieving revision 1.2
diff -r1.2 chop.c
42a43,44
> #include <stdlib.h>
> #include <string.h>
183c185
< int fdout; // output file descriptor
---
> int fdout = -1; // output file descriptor
189c191
< off_t curr_written; // number of bytes written to the
current output file
---
> off_t curr_written = 0; // number of bytes written to the
> current output file
Index: clipboard.cpp
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/clipboard.cpp,v
retrieving revision 1.2
diff -r1.2 clipboard.cpp
160a161,163
> default: //Shouldn't happen
> Status::Code = B_BAD_VALUE;
> break;
Index: df.cpp
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/df.cpp,v
retrieving revision 1.2
diff -r1.2 df.cpp
208c208
< sprintf(temp, "%.1LfK", fblocks);
---
> sprintf(temp, "%.1fK", fblocks);
212c212
< sprintf(temp, "%.1LfM",
fblocks);
---
> sprintf(temp, "%.1fM",
> fblocks);
215c215
< sprintf(temp, "%.1LfG",
fblocks);
---
> sprintf(temp, "%.1fG",
> fblocks);
Index: eject.c
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/eject.c,v
retrieving revision 1.2
diff -r1.2 eject.c
22c22
< int usage(char *prog)
---
> static int usage(char *prog)
Index: hd.c
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/hd.c,v
retrieving revision 1.2
diff -r1.2 hd.c
16a17,18
> #include <stdlib.h>
> #include <string.h>
139c141
< printf("%08x ", offset);
---
> printf("%08lx ", offset);
Index: listarea.c
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/listarea.c,v
retrieving revision 1.2
diff -r1.2 listarea.c
61c61
< printf("memory: total: %4dKB, used: %4dKB, left: %4dKB\n", max,
used, left);
---
> printf("memory: total: %4ldKB, used: %4ldKB, left: %4ldKB\n",
> max, used, left);
73c73
< printf("\nteam %d unknown\n", id);
---
> printf("\nteam %ld unknown\n", id);
77c77
< printf("\nTEAM %4d (%s):\n", id, this_team.args);
---
> printf("\nTEAM %4ld (%s):\n", id, this_team.args);
82c82
< printf("%5d %29s %.8x %8x %8x %5d %5d %5d\n",
---
> printf("%5ld %29s %p %8lx %8lx %5ld %5ld %5ld\n",
Index: listimage.c
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/listimage.c,v
retrieving revision 1.3
diff -r1.3 listimage.c
54c54
< printf("\nCould not retrieve information about team
%ld: \n", id, strerror(status));
---
> printf("\nCould not retrieve information about team
> %ld: %s\n", id, strerror(status));
58c58
< printf("\nTEAM %4d (%s):\n", id, teamInfo.args);
---
> printf("\nTEAM %4ld (%s):\n", id, teamInfo.args);
63c63
< printf("%5d %64s %.8x %.8x %4d %10u\n",
---
> printf("%5ld %64s %p %p %4ld %10lu\n",
Index: listport.c
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/listport.c,v
retrieving revision 1.2
diff -r1.2 listport.c
60c60
< printf("port: total: %5d, used: %5d, left: %5d\n", max, used,
left);
---
> printf("port: total: %5ld, used: %5ld, left: %5ld\n", max,
> used, left);
72c72
< printf("\nteam %d unknown\n", id);
---
> printf("\nteam %ld unknown\n", id);
76c76
< printf("\nTEAM %4d (%s):\n", id, this_team.args);
---
> printf("\nTEAM %4ld (%s):\n", id, this_team.args);
81c81
< printf("%5d %28s %8d %6d\n",
---
> printf("%5ld %28s %8ld %6ld\n",
Index: listsem.c
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/listsem.c,v
retrieving revision 1.1
diff -r1.1 listsem.c
34a35
> #include <stdlib.h>
37c38
< void list_sems(team_info *tinfo)
---
> static void list_sems(team_info *tinfo)
42c43
< printf("TEAM %d (%s):\n", tinfo->team, tinfo->args );
---
> printf("TEAM %ld (%s):\n", tinfo->team, tinfo->args );
48c49
< printf("%7d%31s%7d\n", info.sem ,info.name , info.count
);
---
> printf("%7ld%31s%7ld\n", info.sem ,info.name ,
> info.count );
62c63
< printf("sem: total: %5i, used: %5i, left: %5i\n\n",
sysinfo.max_sems, sysinfo.used_sems, sysinfo.max_sems -
sysinfo.used_sems);
---
> printf("sem: total: %5li, used: %5li, left: %5li\n\n",
> sysinfo.max_sems, sysinfo.used_sems, sysinfo.max_sems -
sysinfo.used_sems);
Index: mount.c
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/mount.c,v
retrieving revision 1.1
diff -r1.1 mount.c
20c20
< void
---
> static void
Index: prio.c
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/prio.c,v
retrieving revision 1.1
diff -r1.1 prio.c
16a17
> #include <stdlib.h>
Index: ps.c
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/ps.c,v
retrieving revision 1.3
diff -r1.3 ps.c
51c51
< printf("%s (team %d) (uid %d) (gid %d)\n",
teaminfo.args, teaminfo.team, teaminfo.uid, teaminfo.gid);
---
> printf("%s (team %ld) (uid %d) (gid %d)\n",
> teaminfo.args, teaminfo.team, teaminfo.uid, teaminfo.gid);
58c58
< printf("%7ld %20s %3s %3d %7lli %7lli ",
thinfo.thread, thinfo.name, thstate, thinfo.priority, thinfo.user_time/
1000, thinfo.kernel_time/1000);
---
> printf("%7ld %20s %3s %3ld %7lli %7lli ",
> thinfo.thread, thinfo.name, thstate, thinfo.priority, thinfo.user_time/
1000, thinfo.kernel_time/1000);
61c61
< printf("%s(%d)\n", sinfo.name,
sinfo.sem);
---
> printf("%s(%ld)\n", sinfo.name,
> sinfo.sem);
69,71c69,71
< printf("%ik (%li bytes) total memory\n", sysinfo.max_pages*
B_PAGE_SIZE/1024, sysinfo.max_pages*B_PAGE_SIZE);
< printf("%ik (%li bytes) currently committed\n",
sysinfo.used_pages*B_PAGE_SIZE/1024, sysinfo.used_pages*B_PAGE_SIZE);
< printf("%ik (%li bytes) currently available\n",
(sysinfo.max_pages-sysinfo.used_pages)*B_PAGE_SIZE/1024,
(sysinfo.max_pages-sysinfo.used_pages)*B_PAGE_SIZE);
---
> printf("%lik (%li bytes) total memory\n", sysinfo.max_pages*
> B_PAGE_SIZE/1024, sysinfo.max_pages*B_PAGE_SIZE);
> printf("%lik (%li bytes) currently committed\n",
> sysinfo.used_pages*B_PAGE_SIZE/1024, sysinfo.used_pages*B_PAGE_SIZE);
> printf("%lik (%li bytes) currently available\n",
> (sysinfo.max_pages-sysinfo.used_pages)*B_PAGE_SIZE/1024,
(sysinfo.max_pages-sysinfo.used_pages)*B_PAGE_SIZE);
Index: renice.c
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/renice.c,v
retrieving revision 1.2
diff -r1.2 renice.c
17a18
> #include <string.h>
52c53
< int32 prio_be_to_unix(int32 prio)
---
> static int32 prio_be_to_unix(int32 prio)
58c59
< int32 prio_unix_to_be(int32 prio)
---
> static int32 prio_unix_to_be(int32 prio)
63c64
< status_t renice_thread(int32 prio, int32 increment, bool use_be_prio,
thread_id th)
---
> static status_t renice_thread(int32 prio, int32 increment, bool
> use_be_prio, thread_id th)
Index: rescan.c
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/rescan.c,v
retrieving revision 1.1
diff -r1.1 rescan.c
3a4
> #include <unistd.h>
Index: roster.cpp
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/roster.cpp,v
retrieving revision 1.1
diff -r1.1 roster.cpp
28d27
< app_info *pinfo = &info;
Index: shutdown.cpp
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/shutdown.cpp,v
retrieving revision 1.5
diff -r1.5 shutdown.cpp
412c412
< thread_id BApp_thread;
---
> thread_id BApp_thread = -1;
Index: sysinfo.c
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/sysinfo.c,v
retrieving revision 1.4
diff -r1.4 sysinfo.c
14a15
> #include <string.h>
244c245
< fprintf(stderr, "cpuid_info(, %ld, %ld): error
0x%08lx\n", 0, i, ret);
---
> fprintf(stderr, "cpuid_info(, %d, %d): error
> 0x%08lx\n", 0, i, ret);
253c254
< fprintf(stderr, "cpuid_info(, %ld,
%ld): error 0x%08lx\n", j, i, ret);
---
> fprintf(stderr, "cpuid_info(, %d, %d):
> error 0x%08lx\n", j, i, ret);
269c270
< fprintf(stderr, "cpuid_info(, %ld,
%ld): error 0x%08lx\n", 0x80000000, i, ret);
---
> fprintf(stderr, "cpuid_info(, %d, %d):
> error 0x%08lx\n", 0x80000000, i, ret);
277c278
< fprintf(stderr, "cpuid_info(, %ld,
%ld): error 0x%08lx\n", 0x80000000+j, i, ret);
---
> fprintf(stderr, "cpuid_info(, %d, %d):
> error 0x%08lx\n", 0x80000000+j, i, ret);
287c288
< printf("\ttype %u, family %u, model %u, stepping %u,
features 0x%08x\n",
---
> printf("\ttype %u, family %u, model %u, stepping %u,
> features 0x%08lx\n",
296c297
< printf("\ttype %u, family %u, model %u,
stepping %u, features 0x%08x\n",
---
> printf("\ttype %u, family %u, model %u,
> stepping %u, features 0x%08lx\n",
339c340
< fprintf(stderr, "cpuid_info(, %ld,
%ld): error 0x%08lx\n", 2, i, ret);
---
> fprintf(stderr, "cpuid_info(, %d, %d):
> error 0x%08lx\n", 2, i, ret);
Index: unchop.c
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/unchop.c,v
retrieving revision 1.2
diff -r1.2 unchop.c
16a17
> #include <string.h>
26c27
< char *temp_file ();
---
> char *temp_file (void);
169c170
< temp_file()
---
> temp_file(void)
cvs server: Diffing addattr
cvs server: Diffing arp
cvs server: Diffing chkbfs
Index: chkbfs/chkbfs.cpp
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/chkbfs/chkbfs.cpp,v
retrieving revision 1.3
diff -r1.3 chkbfs.cpp
30c30
< fprintf(stderr, "%s: could not stat device: %s\n",
gProgramName, name, errno);
---
> fprintf(stderr, "%s: could not stat device: %s: %s\n",
> gProgramName, name, strerror(errno));
215c215
< printf("checked %ld nodes, %Ld blocks not allocated, %Ld blocks
already set, %Ld blocks could be freed\n",
---
> printf("checked %Ld nodes, %Ld blocks not allocated, %Ld blocks
> already set, %Ld blocks could be freed\n",
cvs server: Diffing desklink
cvs server: Diffing gnu
cvs server: Diffing gzip
cvs server: Diffing ifconfig
cvs server: Diffing listdev
Index: listdev/cm_wrapper.c
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/listdev/
cm_wrapper.c,v
retrieving revision 1.1
diff -r1.1 cm_wrapper.c
7a8
> #include "cm_wrapper.h"
Index: listdev/listdev.c
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/listdev/listdev.c,v
retrieving revision 1.1
diff -r1.1 listdev.c
10a11
> #include "cm_wrapper.h"
67c68
< printf("\n io range: min %x max %x align %x
len %x",
---
> printf("\n io range: min %lx max %lx align
> %lx len %lx",
78c79
< printf("\n mem range: min %x max %x align %x
len %x",
---
> printf("\n mem range: min %lx max %lx align
> %lx len %lx",
159c160
< int i;
---
> unsigned int i;
186c187
< printf("%x configurations\n", possible->num_possible);
---
> printf("%lx configurations\n", possible->num_possible);
cvs server: Diffing makeudfimage
cvs server: Diffing mkdos
cvs server: Diffing pc
Index: pc/pc.c
===================================================================
RCS file: /cvsroot/open-beos/current/src/apps/bin/pc/pc.c,v
retrieving revision 1.1
diff -r1.1 pc.c
176c176
< int
---
> static int
216c216
< void
---
> static void
256c256
< char *buff, *fmt_str;
---
> char *buff;
282d281
< int ret;
334,335c333,334
< ULONG val, sum = 0;
< char op, *orig_str;
---
> ULONG val;
> char *orig_str;
841c840
< int i;
---
> unsigned int i;
857c856
< "long (max len == %d bytes)\n", sizeof(LONG));
---
> "long (max len == %ld bytes)\n", sizeof(LONG));
|
|
