struct display *display;
struct calibrator *calibrator;
- display = display_create(argc, argv);
+ display = display_create(&argc, argv);
if (display == NULL) {
fprintf(stderr, "failed to create display: %m\n");
struct display *display;
struct clickdot *clickdot;
- display = display_create(argc, argv);
+ display = display_create(&argc, argv);
if (display == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
if (argc > 1)
return benchmark();
- d = display_create(argc, argv);
+ d = display_create(&argc, argv);
if (d == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
desktop.unlock_task.run = unlock_dialog_finish;
wl_list_init(&desktop.outputs);
- desktop.display = display_create(argc, argv);
+ desktop.display = display_create(&argc, argv);
if (desktop.display == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
struct dnd *dnd;
int i;
- d = display_create(argc, argv);
+ d = display_create(&argc, argv);
if (d == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
g_type_init();
#endif
- editor.display = display_create(argc, argv);
+ editor.display = display_create(&argc, argv);
if (editor.display == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
struct display *d;
struct eventdemo *e;
- argc = parse_options(eventdemo_options,
- ARRAY_LENGTH(eventdemo_options), argc, argv);
+ parse_options(eventdemo_options,
+ ARRAY_LENGTH(eventdemo_options), &argc, argv);
/* Connect to the display and have the arguments parsed */
- d = display_create(argc, argv);
+ d = display_create(&argc, argv);
if (d == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
struct display *d;
struct timeval tv;
- d = display_create(argc, argv);
+ d = display_create(&argc, argv);
if (d == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
{
struct display *d;
- d = display_create(argc, argv);
+ d = display_create(&argc, argv);
if (d == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
int i;
int image_counter = 0;
- d = display_create(argc, argv);
+ d = display_create(&argc, argv);
if (d == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
memset(&virtual_keyboard, 0, sizeof virtual_keyboard);
- virtual_keyboard.display = display_create(argc, argv);
+ virtual_keyboard.display = display_create(&argc, argv);
if (virtual_keyboard.display == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
struct display *display;
struct resizor *resizor;
- display = display_create(argc, argv);
+ display = display_create(&argc, argv);
if (display == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
struct display *d;
int size;
- d = display_create(argc, argv);
+ d = display_create(&argc, argv);
if (d == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
char *config_file;
struct output *output;
- display = display_create(argc, argv);
+ display = display_create(&argc, argv);
if (display == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
NULL);
free(config_file);
- argc = parse_options(terminal_options,
- ARRAY_LENGTH(terminal_options), argc, argv);
+ parse_options(terminal_options,
+ ARRAY_LENGTH(terminal_options), &argc, argv);
- d = display_create(argc, argv);
+ d = display_create(&argc, argv);
if (d == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
usage(EXIT_FAILURE);
}
- d = display_create(argc, argv);
+ d = display_create(&argc, argv);
if (d == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
g_type_init();
- argc = parse_options(view_options,
- ARRAY_LENGTH(view_options), argc, argv);
+ parse_options(view_options, ARRAY_LENGTH(view_options), &argc, argv);
- d = display_create(argc, argv);
+ d = display_create(&argc, argv);
if (d == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return -1;
}
struct display *
-display_create(int argc, char *argv[])
+display_create(int *argc, char *argv[])
{
struct display *d;
};
struct display *
-display_create(int argc, char *argv[]);
+display_create(int *argc, char *argv[]);
void
display_destroy(struct display *display);
init_frand();
- argc = parse_options(wscreensaver_options,
- ARRAY_LENGTH(wscreensaver_options), argc, argv);
+ parse_options(wscreensaver_options,
+ ARRAY_LENGTH(wscreensaver_options), &argc, argv);
- d = display_create(argc, argv);
+ d = display_create(&argc, argv);
if (d == NULL) {
fprintf(stderr, "failed to create display: %m\n");
return EXIT_FAILURE;
int
parse_options(const struct weston_option *options,
- int count, int argc, char *argv[]);
+ int count, int *argc, char *argv[]);
#endif /* CONFIGPARSER_H */
int
parse_options(const struct weston_option *options,
- int count, int argc, char *argv[])
+ int count, int *argc, char *argv[])
{
int i, j, k, len = 0;
- for (i = 1, j = 1; i < argc; i++) {
+ for (i = 1, j = 1; i < *argc; i++) {
for (k = 0; k < count; k++) {
if (options[k].name)
len = strlen(options[k].name);
argv[j++] = argv[i];
}
argv[j] = NULL;
+ *argc = j;
return j;
}
static struct weston_compositor *
drm_compositor_create(struct wl_display *display,
int connector, const char *seat, int tty, int pixman,
- int argc, char *argv[], const char *config_file)
+ int *argc, char *argv[], const char *config_file)
{
struct drm_compositor *ec;
struct udev_device *drm_device;
}
WL_EXPORT struct weston_compositor *
-backend_init(struct wl_display *display, int argc, char *argv[],
+backend_init(struct wl_display *display, int *argc, char *argv[],
const char *config_file)
{
int connector = 0, tty = 0, use_pixman = 0;
}
static struct weston_compositor *
-fbdev_compositor_create(struct wl_display *display, int argc, char *argv[],
+fbdev_compositor_create(struct wl_display *display, int *argc, char *argv[],
const char *config_file, struct fbdev_parameters *param)
{
struct fbdev_compositor *compositor;
}
WL_EXPORT struct weston_compositor *
-backend_init(struct wl_display *display, int argc, char *argv[],
+backend_init(struct wl_display *display, int *argc, char *argv[],
const char *config_file)
{
/* TODO: Ideally, available frame buffers should be enumerated using
static struct weston_compositor *
headless_compositor_create(struct wl_display *display,
int width, int height, const char *display_name,
- int argc, char *argv[], const char *config_file)
+ int *argc, char *argv[], const char *config_file)
{
struct headless_compositor *c;
}
WL_EXPORT struct weston_compositor *
-backend_init(struct wl_display *display, int argc, char *argv[],
+backend_init(struct wl_display *display, int *argc, char *argv[],
const char *config_file)
{
int width = 1024, height = 640;
};
static struct weston_compositor *
-rpi_compositor_create(struct wl_display *display, int argc, char *argv[],
+rpi_compositor_create(struct wl_display *display, int *argc, char *argv[],
const char *config_file, struct rpi_parameters *param)
{
struct rpi_compositor *compositor;
#define DEFAULT_MAX_PLANES 80
WL_EXPORT struct weston_compositor *
-backend_init(struct wl_display *display, int argc, char *argv[],
+backend_init(struct wl_display *display, int *argc, char *argv[],
const char *config_file)
{
struct rpi_parameters param = {
static struct weston_compositor *
wayland_compositor_create(struct wl_display *display,
int width, int height, const char *display_name,
- int argc, char *argv[], const char *config_file)
+ int *argc, char *argv[], const char *config_file)
{
struct wayland_compositor *c;
struct wl_event_loop *loop;
}
WL_EXPORT struct weston_compositor *
-backend_init(struct wl_display *display, int argc, char *argv[],
+backend_init(struct wl_display *display, int *argc, char *argv[],
const char *config_file)
{
int width = 1024, height = 640;
int fullscreen,
int no_input,
int use_pixman,
- int argc, char *argv[], const char *config_file)
+ int *argc, char *argv[], const char *config_file)
{
struct x11_compositor *c;
struct x11_configured_output *o;
}
WL_EXPORT struct weston_compositor *
-backend_init(struct wl_display *display, int argc, char *argv[],
+backend_init(struct wl_display *display, int *argc, char *argv[],
const char *config_file)
{
int fullscreen = 0;
WL_EXPORT int
weston_compositor_init(struct weston_compositor *ec,
struct wl_display *display,
- int argc,
- char *argv[],
+ int *argc, char *argv[],
const char *config_file)
{
struct wl_event_loop *loop;
struct sigaction segv_action;
struct weston_compositor
*(*backend_init)(struct wl_display *display,
- int argc, char *argv[], const char *config_file);
+ int *argc, char *argv[], const char *config_file);
int i;
char *backend = NULL;
const char *modules = "desktop-shell.so", *option_modules = NULL;
{ WESTON_OPTION_BOOLEAN, "version", 0, &version },
};
- argc = parse_options(core_options,
- ARRAY_LENGTH(core_options), argc, argv);
+ parse_options(core_options, ARRAY_LENGTH(core_options), &argc, argv);
if (help)
usage(EXIT_SUCCESS);
if (!backend_init)
exit(EXIT_FAILURE);
- ec = backend_init(display, argc, argv, config_file);
+ ec = backend_init(display, &argc, argv, config_file);
if (ec == NULL) {
weston_log("fatal: failed to create compositor\n");
exit(EXIT_FAILURE);
sigaction(SIGSEGV, &segv_action, NULL);
segv_compositor = ec;
- for (i = 1; argv[i]; i++)
+
+ for (i = 1; i < argc; i++)
weston_log("fatal: unhandled option: %s\n", argv[i]);
- if (argv[1]) {
+ if (argc > 1) {
ret = EXIT_FAILURE;
goto out;
}
int
weston_compositor_init(struct weston_compositor *ec, struct wl_display *display,
- int argc, char *argv[], const char *config_file);
+ int *argc, char *argv[], const char *config_file);
void
weston_compositor_shutdown(struct weston_compositor *ec);
void
noop_renderer_init(struct weston_compositor *ec);
struct weston_compositor *
-backend_init(struct wl_display *display, int argc, char *argv[],
- const char *config_file);
+backend_init(struct wl_display *display, int *argc, char *argv[],
+ const char *config_file);
int
module_init(struct weston_compositor *compositor);