From 0fa64fa3a7c09bd53be91f5c10e01fff8bdf7242 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Mon, 30 Sep 2002 03:01:17 +0000
Subject: [PATCH] * cygpath.cc (close_arg): Remove unused static. * mkgroup.c
(enum_local_users): Avoid compiler warning. (enum_users): Ditto. *
mkpasswd.c: Ditto throughout. * ssp.c: Ditto throughout.
---
winsup/utils/ChangeLog | 8 ++++++++
winsup/utils/cygpath.cc | 1 -
winsup/utils/mkgroup.c | 4 ++--
winsup/utils/mkpasswd.c | 1 +
winsup/utils/ssp.c | 18 +++++++++---------
5 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 01bdd561c..666f57546 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,11 @@
+2002-09-29 Christopher Faylor <cgf@redhat.com>
+
+ * cygpath.cc (close_arg): Remove unused static.
+ * mkgroup.c (enum_local_users): Avoid compiler warning.
+ (enum_users): Ditto.
+ * mkpasswd.c: Ditto throughout.
+ * ssp.c: Ditto throughout.
+
2002-09-18 Christopher Faylor <cgf@redhat.com>
* cygcheck.cc: Include sys/time.h rather than time.h to avoid a
diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc
index 8ba2811c0..93628ffeb 100644
--- a/winsup/utils/cygpath.cc
+++ b/winsup/utils/cygpath.cc
@@ -25,7 +25,6 @@ static const char version[] = "$Revision$";
static char *prog_name;
static char *file_arg;
-static char *close_arg;
static int path_flag, unix_flag, windows_flag, absolute_flag;
static int shortname_flag, longname_flag;
static int ignore_flag, allusers_flag, output_flag;
diff --git a/winsup/utils/mkgroup.c b/winsup/utils/mkgroup.c
index 73a5cb403..d37889360 100644
--- a/winsup/utils/mkgroup.c
+++ b/winsup/utils/mkgroup.c
@@ -140,7 +140,7 @@ enum_local_users (LPWSTR groupname)
MAX_PREFERRED_LENGTH,
&entries, &total, &reshdl))
{
- int i, first = 1;
+ unsigned i, first = 1;
for (i = 0; i < entries; ++i)
if (buf1[i].lgrmi1_sidusage == SidTypeUser)
@@ -259,7 +259,7 @@ enum_users (LPWSTR servername, LPWSTR groupname)
MAX_PREFERRED_LENGTH,
&entries, &total, &reshdl))
{
- int i, first = 1;
+ unsigned i, first = 1;
for (i = 0; i < entries; ++i)
{
diff --git a/winsup/utils/mkpasswd.c b/winsup/utils/mkpasswd.c
index 767c1b816..5c56fa98b 100644
--- a/winsup/utils/mkpasswd.c
+++ b/winsup/utils/mkpasswd.c
@@ -14,6 +14,7 @@
#include <stdio.h>
#include <windows.h>
#include <io.h>
+#include <unistd.h>
#include <sys/cygwin.h>
#include <getopt.h>
#include <lmaccess.h>
diff --git a/winsup/utils/ssp.c b/winsup/utils/ssp.c
index c6379fbfb..611c57a55 100644
--- a/winsup/utils/ssp.c
+++ b/winsup/utils/ssp.c
@@ -72,8 +72,8 @@ typedef struct {
unsigned char real_byte;
} PendingBreakpoints;
-int low_pc=0, high_pc=0;
-unsigned int last_pc=0, pc, last_sp=0, sp;
+unsigned low_pc=0, high_pc=0;
+unsigned last_pc=0, pc, last_sp=0, sp;
int total_cycles, count;
HANDLE hProcess;
PROCESS_INFORMATION procinfo;
@@ -94,10 +94,10 @@ int dll_counts = 0;
int verbose = 0;
#define MAXTHREADS 100
-int active_thread_ids[MAXTHREADS];
+DWORD active_thread_ids[MAXTHREADS];
HANDLE active_threads[MAXTHREADS];
-int thread_step_flags[MAXTHREADS];
-int thread_return_address[MAXTHREADS];
+DWORD thread_step_flags[MAXTHREADS];
+DWORD thread_return_address[MAXTHREADS];
int num_active_threads = 0;
int suspended_count=0;
@@ -158,7 +158,7 @@ remove_breakpoint (unsigned int address)
}
static HANDLE
-lookup_thread_id (int threadId, int *tix)
+lookup_thread_id (DWORD threadId, int *tix)
{
int i;
for (i=0; i<num_active_threads; i++)
@@ -429,7 +429,7 @@ run_program (char *cmdline)
if (remove_breakpoint ((int)event.u.Exception.ExceptionRecord.ExceptionAddress))
{
context.Eip --;
- if (rv != -1)
+ if (!rv)
SetThreadContext (hThread, &context);
if (ReadProcessMemory (hProcess, (void *)context.Esp, &rv, 4, &rv))
thread_return_address[tix] = rv;
@@ -515,7 +515,7 @@ run_program (char *cmdline)
break;
}
- if (rv != -1)
+ if (!rv)
{
if (pc == thread_return_address[tix])
{
@@ -830,7 +830,7 @@ int
main (int argc, char **argv)
{
int c, i;
- int total_pcount, total_scount;
+ int total_pcount = 0, total_scount = 0;
FILE *gmon;
setbuf (stdout, 0);