Skip to content

Commit 2b5de6f

Browse files
MaxSemkocsismate
MaxSem
authored and
kocsismate
committed
Remove proto comments from C files
Closes phpGH-5758
1 parent 4757998 commit 2b5de6f

File tree

234 files changed

+3892
-8084
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+3892
-8084
lines changed

‎Zend/zend_builtin_functions.c

+54-107
Large diffs are not rendered by default.

‎Zend/zend_closures.c

+4-8
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ static zend_bool zend_valid_closure_binding(
109109
}
110110
/* }}} */
111111

112-
/* {{{ proto mixed Closure::call(object to [, mixed parameter] [, mixed ...] )
113-
Call closure, binding to a given object with its class as the scope */
112+
/* {{{ Call closure, binding to a given object with its class as the scope */
114113
ZEND_METHOD(Closure, call)
115114
{
116115
zval *newthis, closure_result;
@@ -187,8 +186,7 @@ ZEND_METHOD(Closure, call)
187186
}
188187
/* }}} */
189188

190-
/* {{{ proto Closure Closure::bind(callable old, object to [, mixed scope])
191-
Create a closure from another one and bind to another object and scope */
189+
/* {{{ Create a closure from another one and bind to another object and scope */
192190
ZEND_METHOD(Closure, bind)
193191
{
194192
zval *newthis, *zclosure, *scope_arg = NULL;
@@ -323,8 +321,7 @@ static int zend_create_closure_from_callable(zval *return_value, zval *callable,
323321
}
324322
/* }}} */
325323

326-
/* {{{ proto Closure Closure::fromCallable(callable callable)
327-
Create a closure from a callable using the current scope. */
324+
/* {{{ Create a closure from a callable using the current scope. */
328325
ZEND_METHOD(Closure, fromCallable)
329326
{
330327
zval *callable;
@@ -591,8 +588,7 @@ static HashTable *zend_closure_get_gc(zend_object *obj, zval **table, int *n) /*
591588
}
592589
/* }}} */
593590

594-
/* {{{ proto Closure::__construct()
595-
Private constructor preventing instantiation */
591+
/* {{{ Private constructor preventing instantiation */
596592
ZEND_COLD ZEND_METHOD(Closure, __construct)
597593
{
598594
zend_throw_error(NULL, "Instantiation of 'Closure' is not allowed");

‎Zend/zend_exceptions.c

+13-26
Original file line numberDiff line numberDiff line change
@@ -267,17 +267,15 @@ static zend_object *zend_error_exception_new(zend_class_entry *class_type) /* {{
267267
}
268268
/* }}} */
269269

270-
/* {{{ proto Exception|Error Exception|Error::__clone()
271-
Clone the exception object */
270+
/* {{{ Clone the exception object */
272271
ZEND_COLD ZEND_METHOD(Exception, __clone)
273272
{
274273
/* Should never be executable */
275274
zend_throw_exception(NULL, "Cannot clone object using __clone()", 0);
276275
}
277276
/* }}} */
278277

279-
/* {{{ proto Exception|Error::__construct(string message, int code [, Throwable previous])
280-
Exception constructor */
278+
/* {{{ Exception constructor */
281279
ZEND_METHOD(Exception, __construct)
282280
{
283281
zend_string *message = NULL;
@@ -308,8 +306,7 @@ ZEND_METHOD(Exception, __construct)
308306
}
309307
/* }}} */
310308

311-
/* {{{ proto Exception::__wakeup()
312-
Exception unserialize checks */
309+
/* {{{ Exception unserialize checks */
313310
#define CHECK_EXC_TYPE(id, type) \
314311
pvalue = zend_read_property_ex(i_get_exception_base(object), (object), ZSTR_KNOWN(id), 1, &value); \
315312
if (Z_TYPE_P(pvalue) != IS_NULL && Z_TYPE_P(pvalue) != type) { \
@@ -329,8 +326,7 @@ ZEND_METHOD(Exception, __wakeup)
329326
}
330327
/* }}} */
331328

332-
/* {{{ proto ErrorException::__construct(string message, int code, int severity [, string filename [, int lineno [, Throwable previous]]])
333-
ErrorException constructor */
329+
/* {{{ ErrorException constructor */
334330
ZEND_METHOD(ErrorException, __construct)
335331
{
336332
zend_string *message = NULL, *filename = NULL;
@@ -380,8 +376,7 @@ ZEND_METHOD(ErrorException, __construct)
380376
#define GET_PROPERTY_SILENT(object, id) \
381377
zend_read_property_ex(i_get_exception_base(object), (object), ZSTR_KNOWN(id), 1, &rv)
382378

383-
/* {{{ proto string Exception|Error::getFile()
384-
Get the file in which the exception occurred */
379+
/* {{{ Get the file in which the exception occurred */
385380
ZEND_METHOD(Exception, getFile)
386381
{
387382
zval *prop, rv;
@@ -393,8 +388,7 @@ ZEND_METHOD(Exception, getFile)
393388
}
394389
/* }}} */
395390

396-
/* {{{ proto int Exception|Error::getLine()
397-
Get the line in which the exception occurred */
391+
/* {{{ Get the line in which the exception occurred */
398392
ZEND_METHOD(Exception, getLine)
399393
{
400394
zval *prop, rv;
@@ -406,8 +400,7 @@ ZEND_METHOD(Exception, getLine)
406400
}
407401
/* }}} */
408402

409-
/* {{{ proto string Exception|Error::getMessage()
410-
Get the exception message */
403+
/* {{{ Get the exception message */
411404
ZEND_METHOD(Exception, getMessage)
412405
{
413406
zval *prop, rv;
@@ -419,8 +412,7 @@ ZEND_METHOD(Exception, getMessage)
419412
}
420413
/* }}} */
421414

422-
/* {{{ proto int Exception|Error::getCode()
423-
Get the exception code */
415+
/* {{{ Get the exception code */
424416
ZEND_METHOD(Exception, getCode)
425417
{
426418
zval *prop, rv;
@@ -433,8 +425,7 @@ ZEND_METHOD(Exception, getCode)
433425
}
434426
/* }}} */
435427

436-
/* {{{ proto array Exception|Error::getTrace()
437-
Get the stack trace for the location in which the exception occurred */
428+
/* {{{ Get the stack trace for the location in which the exception occurred */
438429
ZEND_METHOD(Exception, getTrace)
439430
{
440431
zval *prop, rv;
@@ -447,8 +438,7 @@ ZEND_METHOD(Exception, getTrace)
447438
}
448439
/* }}} */
449440

450-
/* {{{ proto int ErrorException::getSeverity()
451-
Get the exception severity */
441+
/* {{{ Get the exception severity */
452442
ZEND_METHOD(ErrorException, getSeverity)
453443
{
454444
zval *prop, rv;
@@ -590,8 +580,7 @@ static void _build_trace_string(smart_str *str, HashTable *ht, uint32_t num) /*
590580
}
591581
/* }}} */
592582

593-
/* {{{ proto string Exception|Error::getTraceAsString()
594-
Obtain the backtrace for the exception as a string (instead of an array) */
583+
/* {{{ Obtain the backtrace for the exception as a string (instead of an array) */
595584
ZEND_METHOD(Exception, getTraceAsString)
596585
{
597586
zval *trace, *frame, rv;
@@ -631,8 +620,7 @@ ZEND_METHOD(Exception, getTraceAsString)
631620
}
632621
/* }}} */
633622

634-
/* {{{ proto Throwable Exception|Error::getPrevious()
635-
Return previous Throwable or NULL. */
623+
/* {{{ Return previous Throwable or NULL. */
636624
ZEND_METHOD(Exception, getPrevious)
637625
{
638626
zval rv;
@@ -642,8 +630,7 @@ ZEND_METHOD(Exception, getPrevious)
642630
ZVAL_COPY(return_value, GET_PROPERTY_SILENT(ZEND_THIS, ZEND_STR_PREVIOUS));
643631
} /* }}} */
644632

645-
/* {{{ proto string Exception|Error::__toString()
646-
Obtain the string representation of the Exception object */
633+
/* {{{ Obtain the string representation of the Exception object */
647634
ZEND_METHOD(Exception, __toString)
648635
{
649636
zval trace, *exception;

‎Zend/zend_generators.c

+8-16
Original file line numberDiff line numberDiff line change
@@ -828,8 +828,7 @@ static inline void zend_generator_rewind(zend_generator *generator) /* {{{ */
828828
}
829829
/* }}} */
830830

831-
/* {{{ proto void Generator::rewind()
832-
* Rewind the generator */
831+
/* {{{ Rewind the generator */
833832
ZEND_METHOD(Generator, rewind)
834833
{
835834
zend_generator *generator;
@@ -842,8 +841,7 @@ ZEND_METHOD(Generator, rewind)
842841
}
843842
/* }}} */
844843

845-
/* {{{ proto bool Generator::valid()
846-
* Check whether the generator is valid */
844+
/* {{{ Check whether the generator is valid */
847845
ZEND_METHOD(Generator, valid)
848846
{
849847
zend_generator *generator;
@@ -860,8 +858,7 @@ ZEND_METHOD(Generator, valid)
860858
}
861859
/* }}} */
862860

863-
/* {{{ proto mixed Generator::current()
864-
* Get the current value */
861+
/* {{{ Get the current value */
865862
ZEND_METHOD(Generator, current)
866863
{
867864
zend_generator *generator, *root;
@@ -881,8 +878,7 @@ ZEND_METHOD(Generator, current)
881878
}
882879
/* }}} */
883880

884-
/* {{{ proto mixed Generator::key()
885-
* Get the current key */
881+
/* {{{ Get the current key */
886882
ZEND_METHOD(Generator, key)
887883
{
888884
zend_generator *generator, *root;
@@ -902,8 +898,7 @@ ZEND_METHOD(Generator, key)
902898
}
903899
/* }}} */
904900

905-
/* {{{ proto void Generator::next()
906-
* Advances the generator */
901+
/* {{{ Advances the generator */
907902
ZEND_METHOD(Generator, next)
908903
{
909904
zend_generator *generator;
@@ -918,8 +913,7 @@ ZEND_METHOD(Generator, next)
918913
}
919914
/* }}} */
920915

921-
/* {{{ proto mixed Generator::send(mixed value)
922-
* Sends a value to the generator */
916+
/* {{{ Sends a value to the generator */
923917
ZEND_METHOD(Generator, send)
924918
{
925919
zval *value;
@@ -955,8 +949,7 @@ ZEND_METHOD(Generator, send)
955949
}
956950
/* }}} */
957951

958-
/* {{{ proto mixed Generator::throw(Exception exception)
959-
* Throws an exception into the generator */
952+
/* {{{ Throws an exception into the generator */
960953
ZEND_METHOD(Generator, throw)
961954
{
962955
zval *exception;
@@ -993,8 +986,7 @@ ZEND_METHOD(Generator, throw)
993986
}
994987
/* }}} */
995988

996-
/* {{{ proto mixed Generator::getReturn()
997-
* Retrieves the return value of the generator */
989+
/* {{{ Retrieves the return value of the generator */
998990
ZEND_METHOD(Generator, getReturn)
999991
{
1000992
zend_generator *generator;

‎Zend/zend_ini_parser.y

+9-18
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ static int get_int_val(zval *op) {
6060
}
6161
}
6262

63-
/* {{{ zend_ini_do_op()
64-
*/
63+
/* {{{ zend_ini_do_op() */
6564
static void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2)
6665
{
6766
int i_result;
@@ -98,8 +97,7 @@ static void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2)
9897
}
9998
/* }}} */
10099

101-
/* {{{ zend_ini_init_string()
102-
*/
100+
/* {{{ zend_ini_init_string() */
103101
static void zend_ini_init_string(zval *result)
104102
{
105103
if (ZEND_SYSTEM_INI) {
@@ -110,8 +108,7 @@ static void zend_ini_init_string(zval *result)
110108
}
111109
/* }}} */
112110

113-
/* {{{ zend_ini_add_string()
114-
*/
111+
/* {{{ zend_ini_add_string() */
115112
static void zend_ini_add_string(zval *result, zval *op1, zval *op2)
116113
{
117114
int length, op1_len;
@@ -139,8 +136,7 @@ static void zend_ini_add_string(zval *result, zval *op1, zval *op2)
139136
}
140137
/* }}} */
141138

142-
/* {{{ zend_ini_get_constant()
143-
*/
139+
/* {{{ zend_ini_get_constant() */
144140
static void zend_ini_get_constant(zval *result, zval *name)
145141
{
146142
zval *c, tmp;
@@ -167,8 +163,7 @@ static void zend_ini_get_constant(zval *result, zval *name)
167163
}
168164
/* }}} */
169165

170-
/* {{{ zend_ini_get_var()
171-
*/
166+
/* {{{ zend_ini_get_var() */
172167
static void zend_ini_get_var(zval *result, zval *name)
173168
{
174169
zval *curval;
@@ -187,8 +182,7 @@ static void zend_ini_get_var(zval *result, zval *name)
187182
}
188183
/* }}} */
189184

190-
/* {{{ ini_error()
191-
*/
185+
/* {{{ ini_error() */
192186
static ZEND_COLD void ini_error(const char *msg)
193187
{
194188
char *error_buf;
@@ -217,8 +211,7 @@ static ZEND_COLD void ini_error(const char *msg)
217211
}
218212
/* }}} */
219213

220-
/* {{{ zend_parse_ini_file()
221-
*/
214+
/* {{{ zend_parse_ini_file() */
222215
ZEND_API int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_errors, int scanner_mode, zend_ini_parser_cb_t ini_parser_cb, void *arg)
223216
{
224217
int retval;
@@ -246,8 +239,7 @@ ZEND_API int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_erro
246239
}
247240
/* }}} */
248241

249-
/* {{{ zend_parse_ini_string()
250-
*/
242+
/* {{{ zend_parse_ini_string() */
251243
ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int scanner_mode, zend_ini_parser_cb_t ini_parser_cb, void *arg)
252244
{
253245
int retval;
@@ -274,8 +266,7 @@ ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int s
274266
}
275267
/* }}} */
276268

277-
/* {{{ zval_ini_dtor()
278-
*/
269+
/* {{{ zval_ini_dtor() */
279270
static void zval_ini_dtor(zval *zv)
280271
{
281272
if (Z_TYPE_P(zv) == IS_STRING) {

0 commit comments

Comments
 (0)