Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 22 Aug 2019 00:36:16 +0000 (UTC)
From:      Conrad Meyer <cem@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r351370 - head/sys/gdb
Message-ID:  <201908220036.x7M0aHHJ088228@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: cem
Date: Thu Aug 22 00:36:16 2019
New Revision: 351370
URL: https://svnweb.freebsd.org/changeset/base/351370

Log:
  gdb(4): Style
  
  No functional change.
  
  I was surprised to find that no sys/ header already defines the -1 EOF
  convention anywhere, so defined one locally.

Modified:
  head/sys/gdb/gdb_int.h
  head/sys/gdb/gdb_main.c
  head/sys/gdb/gdb_packet.c

Modified: head/sys/gdb/gdb_int.h
==============================================================================
--- head/sys/gdb/gdb_int.h	Thu Aug 22 00:35:17 2019	(r351369)
+++ head/sys/gdb/gdb_int.h	Thu Aug 22 00:36:16 2019	(r351370)
@@ -31,6 +31,10 @@
 #ifndef _GDB_GDB_INT_H_
 #define	_GDB_GDB_INT_H_
 
+#ifndef EOF
+#define EOF	(-1)
+#endif
+
 extern struct gdb_dbgport *gdb_cur;
 
 extern int gdb_listening;
@@ -54,7 +58,7 @@ gdb_rx_char(void)
 		c = *gdb_rxp++;
 		gdb_rxsz--;
 	} else
-		c = -1;
+		c = EOF;
 	return (c);
 }
 

Modified: head/sys/gdb/gdb_main.c
==============================================================================
--- head/sys/gdb/gdb_main.c	Thu Aug 22 00:35:17 2019	(r351369)
+++ head/sys/gdb/gdb_main.c	Thu Aug 22 00:36:16 2019	(r351370)
@@ -653,7 +653,10 @@ gdb_trap(int type, int code)
 		case 'H': {	/* Set thread. */
 			intmax_t tid;
 			struct thread *thr;
-			gdb_rx_char();
+
+			/* Ignore 'g' (general) or 'c' (continue) flag. */
+			(void) gdb_rx_char();
+
 			if (gdb_rx_varhex(&tid)) {
 				gdb_tx_err(EINVAL);
 				break;
@@ -768,7 +771,7 @@ gdb_trap(int type, int code)
 				gdb_tx_err(ENOENT);
 			break;
 		}
-		case -1:
+		case EOF:
 			/* Empty command. Treat as unknown command. */
 			/* FALLTHROUGH */
 		default:

Modified: head/sys/gdb/gdb_packet.c
==============================================================================
--- head/sys/gdb/gdb_packet.c	Thu Aug 22 00:35:17 2019	(r351369)
+++ head/sys/gdb/gdb_packet.c	Thu Aug 22 00:36:16 2019	(r351370)
@@ -197,7 +197,7 @@ gdb_rx_varhex(uintmax_t *vp)
 		v += C2N(c);
 		c = gdb_rx_char();
 	} while (isxdigit(c));
-	if (c != -1) {
+	if (c != EOF) {
 		gdb_rxp--;
 		gdb_rxsz++;
 	}
@@ -343,13 +343,12 @@ gdb_rx_bindata(unsigned char *data, size_t datalen, si
 
 	while (*amt < datalen) {
 		c = gdb_rx_char();
-		/* End of packet? */
-		if (c == -1)
+		if (c == EOF)
 			break;
 		/* Escaped character up next */
 		if (c == '}') {
-			/* Truncated packet? Bail out */
-			if ((c = gdb_rx_char()) == -1)
+			/* Malformed packet. */
+			if ((c = gdb_rx_char()) == EOF)
 				return (1);
 			c ^= 0x20;
 		}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908220036.x7M0aHHJ088228>