projects
/
folded-ctf.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e6dd904
)
Removed the definition of basename, which confuses an existing system one.
master
author
Francois Fleuret
<francois@fleuret.org>
Sat, 18 May 2013 15:03:08 +0000
(17:03 +0200)
committer
Francois Fleuret
<francois@fleuret.org>
Sat, 18 May 2013 15:03:08 +0000
(17:03 +0200)
misc.cc
patch
|
blob
|
history
misc.h
patch
|
blob
|
history
diff --git
a/misc.cc
b/misc.cc
index
a0dd057
..
93903be
100644
(file)
--- a/
misc.cc
+++ b/
misc.cc
@@
-28,14
+28,14
@@
using namespace std;
#include "misc.h"
#include "misc.h"
-char *basename(char *name) {
- char *result = name;
- while(*name) {
- if(*name == '/') result = name + 1;
- name++;
- }
- return result;
-}
+
//
char *basename(char *name) {
+
//
char *result = name;
+
//
while(*name) {
+
//
if(*name == '/') result = name + 1;
+
//
name++;
+
//
}
+
//
return result;
+
//
}
char *next_word(char *buffer, char *r, int buffer_size) {
char *s;
char *next_word(char *buffer, char *r, int buffer_size) {
char *s;
diff --git
a/misc.h
b/misc.h
index
7ad8cbf
..
5255739
100644
(file)
--- a/
misc.h
+++ b/
misc.h
@@
-99,7
+99,7
@@
inline scalar_t xi(scalar_t x) {
scalar_t discrete_entropy(int *n, int nb);
scalar_t discrete_entropy(int *n, int nb);
-char *basename(char *name);
+
//
char *basename(char *name);
char *next_word(char *buffer, char *r, int buffer_size);
char *next_word(char *buffer, char *r, int buffer_size);