nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

majority opinion on cppregex.cpp declaration

Browse Source
This commit is contained in:
nhmall
2015-06-16 21:45:59 -04:00
parent 2939a28aa1
commit 5dc0a5747a
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/version.c
+2 -4
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 version.c $NHDT-Date: 1434505027 2015/06/17 01:37:07 $ $NHDT-Branch: master $:$NHDT-Revision: 1.34 $ */ /* NetHack 3.6 version.c $NHDT-Date: 1434505545 2015/06/17 01:45:45 $ $NHDT-Branch: master $:$NHDT-Revision: 1.35 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -150,15 +150,13 @@ char *buf;
const char *finalphrase; const char *finalphrase;
{ {
char rtbuf[BUFSZ]; char rtbuf[BUFSZ];
int l, i, k; int l, i;
const char *s1 = 0, *s2 = 0, *s3 = 0, *s4 = 0; const char *s1 = 0, *s2 = 0, *s3 = 0, *s4 = 0;
if ((int)strlen(buf) >= (BUFSZ - 1)) if ((int)strlen(buf) >= (BUFSZ - 1))
return; return;
strcpy(rtbuf, buf); strcpy(rtbuf, buf);
k = SIZE(rt_opts) + 1;
for (i = 0; i < (SIZE(rt_opts) + 1); i += 2) { for (i = 0; i < (SIZE(rt_opts) + 1); i += 2) {
if (i < SIZE(rt_opts)) { if (i < SIZE(rt_opts)) {
s1 = ", "; s1 = ", ";
sys/share/cppregex.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
extern "C" { extern "C" {
#include <hack.h> #include <hack.h>
char regex_id[] = "cppregex"; extern const char regex_id[] = "cppregex";
struct nhregex { struct nhregex {
std::unique_ptr<std::regex> re; std::unique_ptr<std::regex> re;