Skip to content

Commit e4cdf9d

Browse files
committed
argcargv.i cosmetic updates
1 parent 0307d07 commit e4cdf9d

File tree

6 files changed

+25
-32
lines changed

6 files changed

+25
-32
lines changed

Lib/lua/argcargv.i

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
/* ------------------------------------------------------------
2-
* --- Argc & Argv ---
3-
* ------------------------------------------------------------
4-
*
5-
* Use it as follow:
6-
*
7-
* %apply (int ARGC, char **ARGV) { (size_t argc, const char **argv) }
8-
* extern int mainApp(size_t argc, const char **argv);
9-
*
10-
* then in the lua:
11-
*
12-
* args = { "arg0", "arg1" }
13-
* mainApp(args);
14-
*
2+
* SWIG library containing argc and argv multi-argument typemaps
3+
4+
Use it as follows:
5+
6+
%apply (int ARGC, char **ARGV) { (size_t argc, const char **argv) }
7+
extern int mainApp(size_t argc, const char **argv);
8+
9+
then from lua:
10+
11+
args = { "arg0", "arg1" }
12+
mainApp(args);
13+
1514
* ------------------------------------------------------------ */
1615

1716
%{

Lib/perl5/argcargv.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ------------------------------------------------------------
2-
* --- Argc & Argv ---
2+
* SWIG library containing argc and argv multi-argument typemaps
33
* ------------------------------------------------------------ */
44

55
%typemap(in) (int ARGC, char **ARGV) {

Lib/php/argcargv.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ------------------------------------------------------------
2-
* --- Argc & Argv ---
2+
* SWIG library containing argc and argv multi-argument typemaps
33
* ------------------------------------------------------------ */
44

55
%typemap(in) (int ARGC, char **ARGV) {

Lib/python/argcargv.i

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
/* ------------------------------------------------------------
2-
* --- Argc & Argv ---
2+
* SWIG library containing argc and argv multi-argument typemaps
33
* ------------------------------------------------------------ */
44

55
%fragment("SWIG_AsArgcArgv","header",fragment="SWIG_AsCharPtrAndSize") {
66
SWIGINTERN int
7-
SWIG_AsArgcArgv(PyObject *input,
8-
swig_type_info *ppchar_info,
9-
size_t *argc, char ***argv, int *owner)
10-
{
7+
SWIG_AsArgcArgv(PyObject *input, swig_type_info *ppchar_info, size_t *argc, char ***argv, int *owner) {
118
void *vptr;
129
int res = SWIG_ConvertPtr(input, &vptr, ppchar_info, 0);
1310
if (!SWIG_IsOK(res)) {
@@ -51,7 +48,7 @@ SWIG_AsArgcArgv(PyObject *input,
5148
} else {
5249
/* seems dangerous, but the user asked for it... */
5350
size_t i = 0;
54-
if (argv) { while (*argv[i] != 0) ++i;}
51+
if (argv) { while (*argv[i] != 0) ++i;}
5552
if (argc) *argc = i;
5653
if (owner) *owner = 0;
5754
return SWIG_OK;
@@ -66,10 +63,10 @@ SWIG_AsArgcArgv(PyObject *input,
6663

6764
%typemap(in,noblock=0,fragment="SWIG_AsArgcArgv") (int ARGC, char **ARGV) (int res,char **argv = 0, size_t argc = 0, int owner= 0) {
6865
res = SWIG_AsArgcArgv($input, $descriptor(char**), &argc, &argv, &owner);
69-
if (!SWIG_IsOK(res)) {
66+
if (!SWIG_IsOK(res)) {
7067
$1 = 0; $2 = 0;
7168
%argument_fail(SWIG_TypeError, "int ARGC, char **ARGV", $symname, $argnum);
72-
} else {
69+
} else {
7370
$1 = %static_cast(argc,$1_ltype);
7471
$2 = %static_cast(argv, $2_ltype);
7572
}

Lib/ruby/argcargv.i

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
/* ------------------------------------------------------------
2-
* --- Argc & Argv ---
3-
* ------------------------------------------------------------ */
4-
5-
/* ------------------------------------------------------------
2+
* SWIG library containing argc and argv multi-argument typemaps
63
7-
Use it as follow:
4+
Use it as follows:
85
96
%apply (int ARGC, char **ARGV) { (size_t argc, const char **argv) }
107
118
%inline %{
129
13-
int mainApp(size_t argc, const char **argv)
10+
int mainApp(size_t argc, const char **argv)
1411
{
1512
return argc;
1613
}
1714
18-
then in the ruby side:
15+
then from ruby:
1916
2017
args = ["asdf", "asdf2"]
2118
mainApp(args);
@@ -31,7 +28,7 @@
3128
VALUE *ptr = RARRAY_PTR($input);
3229
for (i=0; i < size; i++, ptr++) {
3330
$2[i]= StringValuePtr(*ptr);
34-
}
31+
}
3532
$2[i]=NULL;
3633
} else {
3734
$1 = 0; $2 = 0;

Lib/tcl/argcargv.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ------------------------------------------------------------
2-
* --- Argc & Argv ---
2+
* SWIG library containing argc and argv multi-argument typemaps
33
* ------------------------------------------------------------ */
44

55
%typemap(in) (int ARGC, char **ARGV) {

0 commit comments

Comments
 (0)