November 2012 - Wine-commits

André Hentschel : start: Fix mask for creation flags ( coverity).
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 76bc1d76a55f9448a90dfef421dbd39b185ceb40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76bc1d76a55f9448a90dfef42… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 7 23:18:57 2012 +0100 start: Fix mask for creation flags (coverity). --- programs/start/start.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index f3d934e..f1cb26a 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -247,7 +247,7 @@ int wmain (int argc, WCHAR *argv[]) sei.lpDirectory = argv[++i]; } else if (is_option(argv[i], bW)) { - creation_flags &= !CREATE_NEW_CONSOLE; + creation_flags &= ~CREATE_NEW_CONSOLE; } else if (argv[i][0] == '/' && (argv[i][1] == 'i' || argv[i][1] == 'I')) { TRACE("/i is ignored\n"); /* FIXME */

1 0

André Hentschel : winmm: Mark up fallthrough switch case (coverity).
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 126fded4a4a1340fc2d729591625a2e295c136e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=126fded4a4a1340fc2d729591… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 7 23:19:08 2012 +0100 winmm: Mark up fallthrough switch case (coverity). --- dlls/winmm/winmm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 890a3f0..aecb9cf 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1406,6 +1406,7 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm switch (lpMMT->wType) { default: FIXME("Unsupported time type %x\n", lpMMT->wType); + /* fall through */ case TIME_BYTES: case TIME_SAMPLES: lpMMT->wType = TIME_MS;

1 0

André Hentschel : winhlp32: Mark up fallthrough switch case (coverity).
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: bc240bd323187fd5ba92e854adf51c391c834523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc240bd323187fd5ba92e854a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 7 23:19:21 2012 +0100 winhlp32: Mark up fallthrough switch case (coverity). --- programs/winhlp32/winhelp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index b905807..5e854f6 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1480,6 +1480,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, break; default: WINE_FIXME("Unsupported %d\n", win->font_scale); + /* fall through */ case 1: CheckMenuItem(hMenu, MNID_CTXT_FONTS_NORMAL, MF_BYCOMMAND|MF_CHECKED);

1 0

André Hentschel : xcopy: Fix indentation of a break ( coverity).
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 69f2ac0d52df2930da8f89ea0bda005e73b8653a URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f2ac0d52df2930da8f89ea0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 7 23:19:27 2012 +0100 xcopy: Fix indentation of a break (coverity). --- programs/xcopy/xcopy.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index ffd2c56..7a68831 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -821,7 +821,8 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, break; case '-': if (toupper(word[2])=='Y') - flags &= ~OPT_NOPROMPT; break; + flags &= ~OPT_NOPROMPT; + break; case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); rc = RC_HELP; goto out;

1 0

Frédéric Delanoy : d3drm: Fix a leak (coverity).
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 1ae9acb0df361face1b9c4f58fbd1af3ed840454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae9acb0df361face1b9c4f58… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 8 10:37:31 2012 +0100 d3drm: Fix a leak (coverity). --- dlls/d3drm/frame.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index e4c7cfc..764cf58 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2702,7 +2702,10 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_ifa hr = IDirect3DRMFrame_QueryInterface(parent, &IID_IDirect3DRMFrame3, (void**)&p); if (hr != S_OK) + { + HeapFree(GetProcessHeap(), 0, object); return hr; + } IDirect3DRMFrame_Release(parent); IDirect3DRMFrame3_AddChild(p, &object->IDirect3DRMFrame3_iface); }

1 0

Hans Leidekker : xpssvcs: Add stub dll.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: dff501236aad78562131d9d69ed31fa1fad2dc17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff501236aad78562131d9d69… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 8 13:18:25 2012 +0100 xpssvcs: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/xpssvcs/Makefile.in | 6 ++++++ dlls/xpssvcs/main.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/xpssvcs/xpssvcs.spec | 9 +++++++++ 5 files changed, 55 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 991026d..0f55611 100755 --- a/configure +++ b/configure @@ -15810,6 +15810,7 @@ wine_fn_config_dll xmllite enable_xmllite wine_fn_config_test dlls/xmllite/tests xmllite_test wine_fn_config_dll xolehlp enable_xolehlp wine_fn_config_dll xpsprint enable_xpsprint +wine_fn_config_dll xpssvcs enable_xpssvcs wine_fn_config_makefile documentation enable_documentation wine_fn_config_makefile fonts enable_fonts install-lib wine_fn_config_makefile include enable_include install-dev diff --git a/configure.ac b/configure.ac index 6a63e6e..cc32c24 100644 --- a/configure.ac +++ b/configure.ac @@ -3076,6 +3076,7 @@ WINE_CONFIG_DLL(xmllite) WINE_CONFIG_TEST(dlls/xmllite/tests) WINE_CONFIG_DLL(xolehlp) WINE_CONFIG_DLL(xpsprint) +WINE_CONFIG_DLL(xpssvcs) WINE_CONFIG_MAKEFILE([documentation]) WINE_CONFIG_MAKEFILE([fonts],,[install-lib]) WINE_CONFIG_MAKEFILE([include],,[install-dev]) diff --git a/dlls/xpssvcs/Makefile.in b/dlls/xpssvcs/Makefile.in new file mode 100644 index 0000000..206cbcb --- /dev/null +++ b/dlls/xpssvcs/Makefile.in @@ -0,0 +1,6 @@ +MODULE = xpssvcs.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/xpssvcs/main.c b/dlls/xpssvcs/main.c new file mode 100644 index 0000000..98e4643 --- /dev/null +++ b/dlls/xpssvcs/main.c @@ -0,0 +1,38 @@ +/* + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/xpssvcs/xpssvcs.spec b/dlls/xpssvcs/xpssvcs.spec new file mode 100644 index 0000000..335259e --- /dev/null +++ b/dlls/xpssvcs/xpssvcs.spec @@ -0,0 +1,9 @@ +@ stub CreateContainerConsumer +@ stub CreateContainerProducer +@ stub CreateReachPackageReceiver +@ stub CreateReachPackageSender +@ stub CreateSeekableBuffer +@ stub CreateStreamReceiverOnFileHandle +@ stub CreateStreamSenderOnFileHandle +@ stub CreateStreamSenderOnIStream +@ stub DDLogHelper

1 0

Józef Kucia : d3dx9: Handle NULL arguments in D3DXVec3Project.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: a5d5650730eb56dc0136d64ee9d20b544963173e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d5650730eb56dc0136d64ee… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Nov 8 13:45:54 2012 +0100 d3dx9: Handle NULL arguments in D3DXVec3Project. --- dlls/d3dx9_36/math.c | 21 +++++++++++++-------- dlls/d3dx9_36/tests/math.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 117bb84..78317e8 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1809,17 +1809,22 @@ D3DXVECTOR3* WINAPI D3DXVec3Normalize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv) D3DXVECTOR3* WINAPI D3DXVec3Project(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DVIEWPORT9 *pviewport, CONST D3DXMATRIX *pprojection, CONST D3DXMATRIX *pview, CONST D3DXMATRIX *pworld) { D3DXMATRIX m; - D3DXVECTOR3 out; TRACE("(%p, %p, %p, %p, %p, %p)\n", pout, pv, pviewport, pprojection, pview, pworld); - D3DXMatrixMultiply(&m, pworld, pview); - D3DXMatrixMultiply(&m, &m, pprojection); - D3DXVec3TransformCoord(&out, pv, &m); - out.x = pviewport->X + ( 1.0f + out.x ) * pviewport->Width / 2.0f; - out.y = pviewport->Y + ( 1.0f - out.y ) * pviewport->Height / 2.0f; - out.z = pviewport->MinZ + out.z * ( pviewport->MaxZ - pviewport->MinZ ); - *pout = out; + D3DXMatrixIdentity(&m); + if (pworld) D3DXMatrixMultiply(&m, &m, pworld); + if (pview) D3DXMatrixMultiply(&m, &m, pview); + if (pprojection) D3DXMatrixMultiply(&m, &m, pprojection); + + D3DXVec3TransformCoord(pout, pv, &m); + + if (pviewport) + { + pout->x = pviewport->X + ( 1.0f + pout->x ) * pviewport->Width / 2.0f; + pout->y = pviewport->Y + ( 1.0f - pout->y ) * pviewport->Height / 2.0f; + pout->z = pviewport->MinZ + pout->z * ( pviewport->MaxZ - pviewport->MinZ ); + } return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 533c6d7..9bcd42c 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1331,12 +1331,6 @@ static void D3DXVector3Test(void) D3DXVec3Normalize(&gotvec,&nul); expect_vec3(expectedvec,gotvec); -/*_______________D3DXVec3Project_________________________*/ - expectedvec.x = 1135.721924f; expectedvec.y = 147.086914f; expectedvec.z = 0.153412f; - D3DXMatrixPerspectiveFovLH(&projection,D3DX_PI/4.0f,20.0f/17.0f,1.0f,1000.0f); - D3DXVec3Project(&gotvec,&u,&viewport,&projection,&view,&world); - expect_vec3(expectedvec,gotvec); - /*_______________D3DXVec3Scale____________________________*/ expectedvec.x = -58.5f; expectedvec.y = -39.0f; expectedvec.z = -13.0f; D3DXVec3Scale(&gotvec,&u,scale); @@ -1372,6 +1366,32 @@ static void D3DXVector3Test(void) D3DXVec3TransformNormal(&gotvec,&u,&mat); expect_vec3(expectedvec,gotvec); +/*_______________D3DXVec3Project_________________________*/ + expectedvec.x = 1135.721924f; expectedvec.y = 147.086914f; expectedvec.z = 0.153412f; + D3DXMatrixPerspectiveFovLH(&projection,D3DX_PI/4.0f,20.0f/17.0f,1.0f,1000.0f); + D3DXVec3Project(&gotvec,&u,&viewport,&projection,&view,&world); + expect_vec3(expectedvec,gotvec); + /* World matrix can be omitted */ + D3DXMatrixMultiply(&mat,&world,&view); + D3DXVec3Project(&gotvec,&u,&viewport,&projection,&mat,NULL); + expect_vec3(expectedvec,gotvec); + /* Projection matrix can be omitted */ + D3DXMatrixMultiply(&mat,&view,&projection); + D3DXVec3Project(&gotvec,&u,&viewport,NULL,&mat,&world); + expect_vec3(expectedvec,gotvec); + /* View matrix can be omitted */ + D3DXMatrixMultiply(&mat,&world,&view); + D3DXVec3Project(&gotvec,&u,&viewport,&projection,NULL,&mat); + expect_vec3(expectedvec,gotvec); + /* All matrices can be omitted */ + expectedvec.x = 4010.000000f; expectedvec.y = -1695.000000f; expectedvec.z = 1.600000f; + D3DXVec3Project(&gotvec,&u,&viewport,NULL,NULL,NULL); + expect_vec3(expectedvec,gotvec); + /* Viewport can be omitted */ + expectedvec.x = 1.814305f; expectedvec.y = 0.582097f; expectedvec.z = -0.066555f; + D3DXVec3Project(&gotvec,&u,NULL,&projection,&view,&world); + expect_vec3(expectedvec,gotvec); + /*_______________D3DXVec3Unproject_________________________*/ expectedvec.x = -2.913411f; expectedvec.y = 1.593215f; expectedvec.z = 0.380724f; D3DXMatrixPerspectiveFovLH(&projection,D3DX_PI/4.0f,20.0f/17.0f,1.0f,1000.0f);

1 0

Józef Kucia : d3dx9: Handle NULL arguments in D3DXVec3Unproject.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 3e264ced0f2502093940ddda21ecbd024b7dd815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e264ced0f2502093940ddda2… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Nov 8 13:45:55 2012 +0100 d3dx9: Handle NULL arguments in D3DXVec3Unproject. --- dlls/d3dx9_36/math.c | 14 +++++--------- dlls/d3dx9_36/tests/math.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 78317e8..0aebff0 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1936,16 +1936,12 @@ D3DXVECTOR3* WINAPI D3DXVec3Unproject(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, TRACE("(%p, %p, %p, %p, %p, %p)\n", pout, pv, pviewport, pprojection, pview, pworld); - if (pworld) - { - D3DXMatrixMultiply(&m, pworld, pview); - D3DXMatrixMultiply(&m, &m, pprojection); - } - else - { - D3DXMatrixMultiply(&m, pview, pprojection); - } + D3DXMatrixIdentity(&m); + if (pworld) D3DXMatrixMultiply(&m, &m, pworld); + if (pview) D3DXMatrixMultiply(&m, &m, pview); + if (pprojection) D3DXMatrixMultiply(&m, &m, pprojection); D3DXMatrixInverse(&m, NULL, &m); + *pout = *pv; if (pviewport) { diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 9bcd42c..53262b7 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1401,6 +1401,18 @@ static void D3DXVector3Test(void) D3DXMatrixMultiply(&mat,&world,&view); D3DXVec3Unproject(&gotvec,&u,&viewport,&projection,&mat,NULL); expect_vec3(expectedvec,gotvec); + /* Projection matrix can be omitted */ + D3DXMatrixMultiply(&mat,&view,&projection); + D3DXVec3Unproject(&gotvec,&u,&viewport,NULL,&mat,&world); + expect_vec3(expectedvec,gotvec); + /* View matrix can be omitted */ + D3DXMatrixMultiply(&mat,&world,&view); + D3DXVec3Unproject(&gotvec,&u,&viewport,&projection,NULL,&mat); + expect_vec3(expectedvec,gotvec); + /* All matrices can be omitted */ + expectedvec.x = -1.002500f; expectedvec.y = 0.997059f; expectedvec.z = 2.571429f; + D3DXVec3Unproject(&gotvec,&u,&viewport,NULL,NULL,NULL); + expect_vec3(expectedvec,gotvec); /* Viewport can be omitted */ expectedvec.x = -11.018396f; expectedvec.y = 3.218991f; expectedvec.z = 1.380329f; D3DXVec3Unproject(&gotvec,&u,NULL,&projection,&view,&world);

1 0

Alexandre Julliard : ntdll: Fix access/write file time mixup.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 3050f11f47596fa5ad73943366279cea4857a9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3050f11f47596fa5ad7394336… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 8 00:02:06 2012 +0100 ntdll: Fix access/write file time mixup. --- dlls/ntdll/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 234ed7e..da5be8e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2112,7 +2112,7 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, return io->u.Status; if (info->LastAccessTime.QuadPart || info->LastWriteTime.QuadPart) - io->u.Status = set_file_times( fd, &info->LastAccessTime, &info->LastWriteTime ); + io->u.Status = set_file_times( fd, &info->LastWriteTime, &info->LastAccessTime ); if (io->u.Status == STATUS_SUCCESS && info->FileAttributes) {

1 0

Alexandre Julliard : configure: Check for getopt_long_only instead of getopt_long.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 551077ab73ae0ff5ae8d92a5a0264787230813fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=551077ab73ae0ff5ae8d92a5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 8 00:04:13 2012 +0100 configure: Check for getopt_long_only instead of getopt_long. Some platforms have the latter but not the former. --- configure | 2 +- configure.ac | 2 +- include/config.h.in | 4 ++-- libs/port/getopt.c | 28 +++------------------------- libs/port/getopt1.c | 16 +++------------- 5 files changed, 10 insertions(+), 42 deletions(-) diff --git a/configure b/configure index bc31918..4f020cf 100755 --- a/configure +++ b/configure @@ -13017,7 +13017,7 @@ for ac_func in \ futimesat \ getattrlist \ getdirentries \ - getopt_long \ + getopt_long_only \ getpagesize \ getpwuid \ gettimeofday \ diff --git a/configure.ac b/configure.ac index 1adb6fd..b1e479d 100644 --- a/configure.ac +++ b/configure.ac @@ -2019,7 +2019,7 @@ AC_CHECK_FUNCS(\ futimesat \ getattrlist \ getdirentries \ - getopt_long \ + getopt_long_only \ getpagesize \ getpwuid \ gettimeofday \ diff --git a/include/config.h.in b/include/config.h.in index 8dc812b..6822052 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -206,8 +206,8 @@ /* Define to 1 if you have the <getopt.h> header file. */ #undef HAVE_GETOPT_H -/* Define to 1 if you have the `getopt_long' function. */ -#undef HAVE_GETOPT_LONG +/* Define to 1 if you have the `getopt_long_only' function. */ +#undef HAVE_GETOPT_LONG_ONLY /* Define to 1 if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE diff --git a/libs/port/getopt.c b/libs/port/getopt.c index eeb64a6..e38d137 100644 --- a/libs/port/getopt.c +++ b/libs/port/getopt.c @@ -33,7 +33,7 @@ # include <config.h> #endif -#ifdef HAVE_GETOPT_LONG +#ifdef HAVE_GETOPT_LONG_ONLY #define ELIDE_CODE #endif @@ -218,26 +218,7 @@ static char *posixly_correct; # include <strings.h> # endif -/* Avoid depending on library functions or files - whose names are inconsistent. */ - -#ifndef getenv -extern char *getenv (); -#endif - -static char * -my_index (str, chr) - const char *str; - int chr; -{ - while (*str) - { - if (*str == chr) - return (char *) str; - str++; - } - return 0; -} +# define my_index strchr /* If using GCC, we can safely declare strlen this way. If not using GCC, it is ok not to declare it. */ @@ -1196,10 +1177,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only) } int -getopt (argc, argv, optstring) - int argc; - char *const *argv; - const char *optstring; +getopt (int argc, char * const *argv, const char *optstring) { return _getopt_internal (argc, argv, optstring, NULL, diff --git a/libs/port/getopt1.c b/libs/port/getopt1.c index 37249b6..5cf9f01 100644 --- a/libs/port/getopt1.c +++ b/libs/port/getopt1.c @@ -24,7 +24,7 @@ #include <config.h> #endif -#ifdef HAVE_GETOPT_LONG +#ifdef HAVE_GETOPT_LONG_ONLY #define ELIDE_CODE #endif @@ -74,12 +74,7 @@ #endif int -getopt_long (argc, argv, options, long_options, opt_index) - int argc; - char *const *argv; - const char *options; - const struct option *long_options; - int *opt_index; +getopt_long (int argc, char * const *argv, const char *options, const struct option *long_options, int *opt_index) { return _getopt_internal (argc, argv, options, long_options, opt_index, 0); } @@ -90,12 +85,7 @@ getopt_long (argc, argv, options, long_options, opt_index) instead. */ int -getopt_long_only (argc, argv, options, long_options, opt_index) - int argc; - char *const *argv; - const char *options; - const struct option *long_options; - int *opt_index; +getopt_long_only (int argc, char * const *argv, const char *options, const struct option *long_options, int *opt_index) { return _getopt_internal (argc, argv, options, long_options, opt_index, 1); }

1 0