Skip to content

[Runtime] Enable the -Wsign-conversion on monotouch-debug files. #7459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mandel-macaque merged 4 commits into from
Nov 20, 2019
Merged

[Runtime] Enable the -Wsign-conversion on monotouch-debug files. #7459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
236a71f
[Runtime] Enable the -Wsign-conversion on monotouch-debug files.
mandel-macaque Nov 15, 2019
ee7348c
Address reviews.
mandel-macaque Nov 18, 2019
7e63a4f
Missing new line.
mandel-macaque Nov 18, 2019
dbc5aa3
Update runtime/monotouch-debug.m
mandel-macaque Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions runtime/monotouch-debug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ typedef struct {
void (*connect) (const char *address);
void (*close1) (void);
void (*close2) (void);
gboolean (*send) (void *buf, int len);
int (*recv) (void *buf, int len);
gboolean (*send) (void *buf, size_t len);
ssize_t (*recv) (void *buf, size_t len);
} DebuggerTransport;

void mono_debugger_agent_parse_options (const char *options);
Expand Down
52 changes: 25 additions & 27 deletions runtime/monotouch-debug.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
// Copyright 2011-2013 Xamarin Inc.
//

// TODO: temp ignore to minimize diff
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wsign-conversion"

#ifdef DEBUG

//#define LOG_HTTP(...) do { NSLog (@ __VA_ARGS__); } while (0);
Expand Down Expand Up @@ -203,7 +199,7 @@ -(int) localDescriptor;
-(void) reportCompletion: (bool) success;

-(void) connect: (NSString *) ip port: (unsigned long) port completionHandler: (void (^)(bool)) completionHandler;
-(void) sendData: (void *) buffer length: (long) length;
-(void) sendData: (void *) buffer length: (unsigned int) length;

/* NSURLSessionDelegate */
-(void) URLSession:(NSURLSession *)session didBecomeInvalidWithError:(NSError *)error;
Expand All @@ -230,7 +226,7 @@ -(void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didComp
long rv = read (fd, buf, 1024);
LOG_HTTP ("%i http send read %i bytes from fd=%i; %i=%s", connection.id, rv, fd, errno, strerror (errno));
if (rv > 0) {
[connection sendData: buf length: rv];
[connection sendData: buf length: (unsigned int) rv];
} else if (rv == -1) {
if (errno == EINTR)
continue;
Expand Down Expand Up @@ -308,7 +304,7 @@ -(void) connect: (NSString *) ip port: (unsigned long) port completionHandler: (
LOG_HTTP ("%i Connecting to: %@:%i downloadTask: %@", self.id, ip, port, [[downloadTask currentRequest] URL]);
}

-(void) sendData: (void *) buffer length: (long) length
-(void) sendData: (void *) buffer length: (unsigned int) length
{
int c = atomic_fetch_add (&http_send_counter, 1);

Expand Down Expand Up @@ -356,7 +352,7 @@ -(void) URLSession: (NSURLSession *) session dataTask: (NSURLSessionDataTask *)
wr = write (fd, bytes, left);
} while (wr == -1 && errno == EINTR);
if (wr > 0) {
left -= wr;
left -= (NSUInteger) wr;
LOG_HTTP ("%i didReceiveData wrote %i/%lu bytes to %i; %lu bytes left", self.id, wr, (unsigned long) total, fd, (unsigned long) left);
} else if (wr == 0) {
LOG_HTTP ("%i didReceiveData no data written.", self.id);
Expand Down Expand Up @@ -595,7 +591,7 @@ void monotouch_configure_debugging ()
} else if ((shmkey = ftok ("/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin/mtouch", 0)) == -1) {
LOG (PRODUCT ": Could not create shared memory key: %s\n", strerror (errno));
} else {
int shmsize = 1024;
size_t shmsize = 1024;
int shmid = shmget (shmkey, shmsize, 0);
if (shmid == -1) {
LOG (PRODUCT ": Could not get shared memory id: %s\n", strerror (errno));
Expand Down Expand Up @@ -738,33 +734,33 @@ static void sdb_close2 (void)
shutdown (sdb_fd, SHUT_RDWR);
}

static gboolean send_uninterrupted (int fd, const void *buf, int len)
static gboolean send_uninterrupted (int fd, const void *buf, size_t len)
{
long res;
ssize_t res;

do {
res = send (fd, buf, len, 0);
} while (res == -1 && errno == EINTR);

return res == len;
return (size_t) res == len;
}

static int recv_uninterrupted (int fd, void *buf, int len)
static ssize_t recv_uninterrupted (int fd, void *buf, size_t len)
{
long res;
int total = 0;
ssize_t res;
ssize_t total = 0;
int flags = 0;

do {
res = recv (fd, (char *) buf + total, len - total, flags);
res = recv (fd, (char *) buf + total, len - (size_t) total, flags);
if (res > 0)
total += res;
} while ((res > 0 && total < len) || (res == -1 && errno == EINTR));
} while ((res > 0 && (size_t) total < len) || (res == -1 && errno == EINTR));

return total;
}

static gboolean sdb_send (void *buf, int len)
static gboolean sdb_send (void *buf, size_t len)
{
gboolean rv;

Expand All @@ -780,9 +776,9 @@ static gboolean sdb_send (void *buf, int len)
}


static int sdb_recv (void *buf, int len)
static ssize_t sdb_recv (void *buf, size_t len)
{
int rv;
ssize_t rv;

if (debugging_configured) {
MONO_ENTER_GC_SAFE;
Expand Down Expand Up @@ -837,7 +833,12 @@ static int sdb_recv (void *buf, int len)
connection.ip = [ips objectAtIndex: i];
connection.uniqueRequest = unique_request;
[connections addObject: connection];
[connection connect: [ips objectAtIndex: i] port: monodevelop_port completionHandler: ^void (bool success)
if (monodevelop_port <= 0) {
// Make sure we do have a valid port
NSLog (@"Could not find a valid port to connect to the IDE.");
return;
}
[connection connect: [ips objectAtIndex: i] port: (unsigned long) monodevelop_port completionHandler: ^void (bool success)
{
LOG_HTTP ("Connected: %@: %i", connection, success);
pthread_mutex_lock (&connected_mutex);
Expand Down Expand Up @@ -940,7 +941,7 @@ static int sdb_recv (void *buf, int len)
fcntl (sockets[i], F_SETFL, flags | O_NONBLOCK);

// Connect to the host
if ((rv = connect (sockets[i], (struct sockaddr *) sockaddr, len)) == 0) {
if ((rv = connect (sockets[i], (struct sockaddr *) sockaddr, (socklen_t) len)) == 0) {
// connection completed, this is our man.
connection_port = i;
connected = true;
Expand Down Expand Up @@ -1268,7 +1269,7 @@ static int sdb_recv (void *buf, int len)

while (true) {
char command [257];
int rv;
ssize_t rv;
unsigned char cmd_len;

rv = recv_uninterrupted (fd, &cmd_len, 1);
Expand Down Expand Up @@ -1546,7 +1547,7 @@ int monotouch_debug_connect (NSMutableArray *ips, int debug_port, int output_por
fcntl (sockets[i], F_SETFL, flags | O_NONBLOCK);

// Connect to the host
if ((rv = connect (sockets[i], (struct sockaddr *) sockaddr, len)) == 0) {
if ((rv = connect (sockets[i], (struct sockaddr *) sockaddr, (socklen_t) len)) == 0) {
// connection completed, this is our man.
connected = true;
connection_port = i;
Expand Down Expand Up @@ -1726,6 +1727,3 @@ int monotouch_debug_connect (NSMutableArray *ips, int debug_port, int output_por
#else
int xamarin_fix_ranlib_warning_about_no_symbols_v2;
#endif /* DEBUG */


#pragma clang diagnostic pop