Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix reserved identifier violations. #218

Conversation

elfring
Copy link

@elfring elfring commented Feb 18, 2014

This is a companion update suggestion for the issue "reserved identifier violation".

Affected identifiers can become standard-compliant by the shown renaming.

Some include guards did not fit to the expected naming convention of the
C language standard.
https://www.securecoding.cert.org/confluence/display/seccode/DCL37-C.+Do+not+declare+or+define+a+reserved+identifier#DCL37-C.Donotdeclareordefineareservedidentifier-NoncompliantCodeExample%28HeaderGuard%29

This implementation detail was fixed by the deletion of underscores.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
…ompliant.

Some data structure identifiers did not fit to the expected naming convention
of the C language standard.
https://www.securecoding.cert.org/confluence/display/seccode/DCL37-C.+Do+not+declare+or+define+a+reserved+identifier

This implementation detail was fixed by the movement of underscores from the
beginning in affected identifiers to the end.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
@stefwalter
Copy link
Contributor

Please build and test your patches (with make check) before submitting them. This patch doesn't build. It has at least the following errors:

../src/websocket/websocketclient.c: In function 'web_socket_client_get_type':
../src/websocket/websocketclient.c:49:1503: error: invalid application of 'sizeof' to incomplete type 'WebSocketClientClass'
 G_DEFINE_TYPE (WebSocketClient, web_socket_client, WEB_SOCKET_TYPE_CONNECTION);
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               ^
../src/websocket/websocketclient.c:49:1588: error: invalid application of 'sizeof' to incomplete type 'WebSocketClient'
 G_DEFINE_TYPE (WebSocketClient, web_socket_client, WEB_SOCKET_TYPE_CONNECTION);
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ^
../src/websocket/websocketclient.c: In function 'verify_handshake_rfc6455':
../src/websocket/websocketclient.c:80:74: error: dereferencing pointer to incomplete type
       !_web_socket_connection_choose_protocol (conn, (const gchar **)self->possible_protocols,
                                                                          ^
../src/websocket/websocketclient.c:93:35: error: dereferencing pointer to incomplete type
   if (value == NULL || self->accept_key == NULL ||
                                   ^
../src/websocket/websocketclient.c:94:31: error: dereferencing pointer to incomplete type
       g_ascii_strcasecmp (self->accept_key, value))
                               ^
../src/websocket/websocketclient.c: In function 'verify_handshake_hixie76':
../src/websocket/websocketclient.c:118:74: error: dereferencing pointer to incomplete type
       !_web_socket_connection_choose_protocol (conn, (const gchar **)self->possible_protocols,
                                                                          ^
../src/websocket/websocketclient.c:130:11: error: dereferencing pointer to incomplete type
   if (self->accept_key == NULL || memcmp (response, self->accept_key, 16) != 0)
           ^
../src/websocket/websocketclient.c:130:64: error: dereferencing pointer to incomplete type
   if (self->accept_key == NULL || memcmp (response, self->accept_key, 16) != 0)
                                                                ^
../src/websocket/websocketclient.c: In function 'include_custom_headers':
../src/websocket/websocketclient.c:255:12: error: dereferencing pointer to incomplete type
   if (!self->include_headers)
            ^
../src/websocket/websocketclient.c:258:38: error: dereferencing pointer to incomplete type
   g_hash_table_iter_init (&iter, self->include_headers);
                                      ^
../src/websocket/websocketclient.c: In function 'request_handshake_rfc6455':
../src/websocket/websocketclient.c:290:15: error: dereferencing pointer to incomplete type
   g_free (self->accept_key);
               ^
../src/websocket/websocketclient.c:291:7: error: dereferencing pointer to incomplete type
   self->accept_key = _web_socket_complete_accept_key_rfc6455 (key);
       ^
../src/websocket/websocketclient.c:306:11: error: dereferencing pointer to incomplete type
   if (self->possible_protocols)
           ^
../src/websocket/websocketclient.c:308:41: error: dereferencing pointer to incomplete type
       protocols = g_strjoinv (", ", self->possible_protocols);
                                         ^
../src/websocket/websocketclient.c: In function 'request_handshake_hixie76':
../src/websocket/websocketclient.c:382:15: error: dereferencing pointer to incomplete type
   g_free (self->accept_key);
               ^
../src/websocket/websocketclient.c:383:7: error: dereferencing pointer to incomplete type
   self->accept_key = _web_socket_complete_challenge_hixie76 (number_1, number_2, challenge);
       ^
../src/websocket/websocketclient.c:401:11: error: dereferencing pointer to incomplete type
   if (self->possible_protocols)
           ^
../src/websocket/websocketclient.c:403:40: error: dereferencing pointer to incomplete type
       protocols = g_strjoinv (" ", self->possible_protocols);
                                        ^
../src/websocket/websocketclient.c: In function 'request_handshake':
../src/websocket/websocketclient.c:428:7: error: dereferencing pointer to incomplete type
   self->handshake_started = TRUE;
       ^
../src/websocket/websocketclient.c: In function 'on_idle_do_handshake':
../src/websocket/websocketclient.c:460:23: error: dereferencing pointer to incomplete type
   g_source_unref (self->idle_start);
                       ^
../src/websocket/websocketclient.c:461:7: error: dereferencing pointer to incomplete type
   self->idle_start = NULL;
       ^
../src/websocket/websocketclient.c: In function 'web_socket_client_constructed':
../src/websocket/websocketclient.c:511:11: error: dereferencing pointer to incomplete type
       self->idle_start = g_idle_source_new ();
           ^
../src/websocket/websocketclient.c:512:34: error: dereferencing pointer to incomplete type
       g_source_set_priority (self->idle_start, G_PRIORITY_HIGH);
                                  ^
../src/websocket/websocketclient.c:513:34: error: dereferencing pointer to incomplete type
       g_source_set_callback (self->idle_start, (GSourceFunc)on_idle_do_handshake,
                                  ^
../src/websocket/websocketclient.c:515:28: error: dereferencing pointer to incomplete type
       g_source_attach (self->idle_start, _web_socket_connection_get_main_context (conn));
                            ^
../src/websocket/websocketclient.c:520:11: error: dereferencing pointer to incomplete type
       self->cancellable = g_cancellable_new ();
           ^
../src/websocket/websocketclient.c:536:49: error: dereferencing pointer to incomplete type
                                             self->cancellable, on_connect_to_uri,
                                                 ^
../src/websocket/websocketclient.c: In function 'web_socket_client_set_property':
../src/websocket/websocketclient.c:561:19: error: dereferencing pointer to incomplete type
       g_return_if_fail (self->handshake_started == FALSE);
                   ^
../src/websocket/websocketclient.c:562:23: error: dereferencing pointer to incomplete type
       g_strfreev (self->possible_protocols);
                       ^
../src/websocket/websocketclient.c:563:11: error: dereferencing pointer to incomplete type
       self->possible_protocols = g_value_dup_boxed (value);
           ^
../src/websocket/websocketclient.c: In function 'web_socket_client_close':
../src/websocket/websocketclient.c:577:11: error: dereferencing pointer to incomplete type
   if (self->cancellable)
           ^
../src/websocket/websocketclient.c:578:31: error: dereferencing pointer to incomplete type
     g_cancellable_cancel (self->cancellable);
                               ^
../src/websocket/websocketclient.c:579:11: error: dereferencing pointer to incomplete type
   if (self->idle_start)
           ^
../src/websocket/websocketclient.c:581:29: error: dereferencing pointer to incomplete type
       g_source_destroy (self->idle_start);
                             ^
../src/websocket/websocketclient.c:582:27: error: dereferencing pointer to incomplete type
       g_source_unref (self->idle_start);
                           ^
../src/websocket/websocketclient.c: In function 'web_socket_client_finalize':
../src/websocket/websocketclient.c:591:19: error: dereferencing pointer to incomplete type
   g_strfreev (self->possible_protocols);
                   ^
../src/websocket/websocketclient.c:592:15: error: dereferencing pointer to incomplete type
   g_free (self->accept_key);
               ^
../src/websocket/websocketclient.c:593:11: error: dereferencing pointer to incomplete type
   if (self->include_headers)
           ^
../src/websocket/websocketclient.c:594:29: error: dereferencing pointer to incomplete type
     g_hash_table_unref (self->include_headers);
                             ^
../src/websocket/websocketclient.c:595:11: error: dereferencing pointer to incomplete type
   if (self->cancellable)
           ^
../src/websocket/websocketclient.c:596:25: error: dereferencing pointer to incomplete type
     g_object_unref (self->cancellable);
                         ^
../src/websocket/websocketclient.c:597:16: error: dereferencing pointer to incomplete type
   g_assert (self->idle_start == NULL);
                ^
../src/websocket/websocketclient.c: In function 'web_socket_client_include_header':
../src/websocket/websocketclient.c:701:15: error: dereferencing pointer to incomplete type
   g_return_if_fail (self->handshake_started == FALSE);
               ^
../src/websocket/websocketclient.c:703:12: error: dereferencing pointer to incomplete type
   if (!self->include_headers)
            ^
../src/websocket/websocketclient.c:704:11: error: dereferencing pointer to incomplete type
       self->include_headers = web_socket_util_new_headers ();
           ^
../src/websocket/websocketclient.c:705:28: error: dereferencing pointer to incomplete type
   g_hash_table_insert (self->include_headers,
                            ^

@mvollmer
Copy link
Member

mvollmer commented Mar 5, 2014

Closing because of inactivity. Please reopen or make a new pull request if you are still working on this.

@mvollmer mvollmer closed this Mar 5, 2014
marusak pushed a commit to marusak/cockpit that referenced this pull request Jan 29, 2020
See https://docs.fedoraproject.org/en-US/fedora-coreos/getting-started/
for how Ignition works for the initial setup. The *.ign file isn't too
bad (JSON), but YAML is easier to edit and the official format - so
commit both the original .fcc YAML, and the compiled JSON so that we
don't need fcct in our bots.

This also provides an initial *.install script for cockpit. This does
update to the locally built *.rpms for the "target machine" parts
(cockpit-bridge, -system, etc.) but does *not* yet update the cockpit/ws
container into the locally built cockpit-ws. Don't use
lib/atomic.install for that, as it requires Python (which is not
installed on FCOS) and also uses a very complicated way of updating RPMs
which isn't necessary at all any more with contemporary rpm-ostree.

Adjust Machine's `{start,restart,stop}_cockpit()` methods to work with
podman. Cockpit's atomic-{install,run} scripts work fine with CoreOS
and podman, and we can use `podman container runlabel` as successor of
`atomic run`.

Prerequisite for cockpit-project#11002

Closes cockpit-project#218
marusak pushed a commit to marusak/cockpit that referenced this pull request Jan 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants