diff options
| author | shennetsind <ind@henn.et> | 2013-09-25 09:07:33 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-25 09:07:33 -0300 |
| commit | 13afb7e0bf35bacc9c90c7dffe34120ddd2fd099 (patch) | |
| tree | 180c739ac69aceab8ce4cc6151030539a32ac8c3 /src/common/strlib.h | |
| parent | 1114eb3da58b078258a824424fef687a1ccee90c (diff) | |
| parent | 66979ef89363c03e3cc02d63feb5248836daff4e (diff) | |
| download | hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.gz hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.bz2 hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.xz hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Conflicts:
src/map/chrif.c
src/map/clif.c
src/map/homunculus.c
src/map/pet.c
src/map/script.c
src/map/skill.c
src/map/status.c
All clear.
Diffstat (limited to 'src/common/strlib.h')
| -rw-r--r-- | src/common/strlib.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/strlib.h b/src/common/strlib.h index 9b1875d45..5ef455a0e 100644 --- a/src/common/strlib.h +++ b/src/common/strlib.h @@ -124,9 +124,9 @@ struct sv_interface { /// Parses a single field in a delim-separated string. /// The delimiter after the field is skipped. /// - /// @param sv Parse state + /// @param svstate Parse state /// @return 1 if a field was parsed, 0 if done, -1 on error. - int (*parse_next) (struct s_svstate* sv); + int (*parse_next) (struct s_svstate* svstate); /// Parses a delim-separated string. /// Starts parsing at startoff and fills the pos array with position pairs. |