mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-21 18:24:49 +00:00
Use %NULL macro in doc strings
Mass-converted "NULL" to "%NULL" in docstrings with find -name '*.c'| xargs sed -i '/^ \*.*[^%]NULL/ s/NULL\b/%NULL/g'
This commit is contained in:
Martin Pitt
Dan Winship
parent
6226fb9b59
commit
57a9fb3c89
|
|
@ -585,7 +585,7 @@ activate_nm_not_running (gpointer user_data)
|
|||
* @device: (allow-none): the #NMDevice
|
||||
* @specific_object: (allow-none): the object path of a connection-type-specific
|
||||
* object this activation should use. This parameter is currently ignored for
|
||||
* wired and mobile broadband connections, and the value of NULL should be used
|
||||
* wired and mobile broadband connections, and the value of %NULL should be used
|
||||
* (ie, no specific object). For WiFi or WiMAX connections, pass the object
|
||||
* path of a #NMAccessPoint or #NMWimaxNsp owned by @device, which you can
|
||||
* get using nm_object_get_path(), and which will be used to complete the
|
||||
|
|
@ -666,12 +666,12 @@ add_activate_cb (DBusGProxy *proxy,
|
|||
* nm_client_add_and_activate_connection:
|
||||
* @client: a #NMClient
|
||||
* @partial: (allow-none): an #NMConnection to add; the connection may be
|
||||
* partially filled (or even NULL) and will be completed by NetworkManager
|
||||
* partially filled (or even %NULL) and will be completed by NetworkManager
|
||||
* using the given @device and @specific_object before being added
|
||||
* @device: the #NMDevice
|
||||
* @specific_object: (allow-none): the object path of a connection-type-specific
|
||||
* object this activation should use. This parameter is currently ignored for
|
||||
* wired and mobile broadband connections, and the value of NULL should be used
|
||||
* wired and mobile broadband connections, and the value of %NULL should be used
|
||||
* (ie, no specific object). For WiFi or WiMAX connections, pass the object
|
||||
* path of a #NMAccessPoint or #NMWimaxNsp owned by @device, which you can
|
||||
* get using nm_object_get_path(), and which will be used to complete the
|
||||
|
|
|
|||
|
|
@ -369,7 +369,7 @@ nm_device_wimax_get_tx_power (NMDeviceWimax *self)
|
|||
*
|
||||
* Gets the ID of the serving Base Station when the device is connected.
|
||||
*
|
||||
* Returns: the ID of the serving Base Station, or NULL
|
||||
* Returns: the ID of the serving Base Station, or %NULL
|
||||
**/
|
||||
const char *
|
||||
nm_device_wimax_get_bsid (NMDeviceWimax *self)
|
||||
|
|
|
|||
|
|
@ -1266,7 +1266,7 @@ nm_device_get_state (NMDevice *device)
|
|||
/**
|
||||
* nm_device_get_state_reason:
|
||||
* @device: a #NMDevice
|
||||
* @reason: (out) (allow-none): location to store reason (#NMDeviceStateReason), or NULL
|
||||
* @reason: (out) (allow-none): location to store reason (#NMDeviceStateReason), or %NULL
|
||||
*
|
||||
* Gets the current #NMDevice state (return value) and the reason for entering
|
||||
* the state (@reason argument).
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ get_secrets_cb (DBusGProxy *proxy, DBusGProxyCall *proxy_call, gpointer user_dat
|
|||
* @connection: the #NMRemoteConnection
|
||||
* @setting_name: the #NMSetting object name to get secrets for
|
||||
* @callback: (scope async): a function to be called when the update completes;
|
||||
* must not be NULL
|
||||
* must not be %NULL
|
||||
* @user_data: (closure): caller-specific data to be passed to @callback
|
||||
*
|
||||
* Request the connection's secrets.
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ add_connection_info_complete (NMRemoteSettings *self,
|
|||
*
|
||||
* Returns the %NMRemoteConnection representing the connection at @path.
|
||||
*
|
||||
* Returns: (transfer none): the remote connection object on success, or NULL if the object was
|
||||
* Returns: (transfer none): the remote connection object on success, or %NULL if the object was
|
||||
* not known
|
||||
**/
|
||||
NMRemoteConnection *
|
||||
|
|
@ -206,7 +206,7 @@ nm_remote_settings_get_connection_by_path (NMRemoteSettings *settings, const cha
|
|||
*
|
||||
* Returns the %NMRemoteConnection identified by @uuid.
|
||||
*
|
||||
* Returns: (transfer none): the remote connection object on success, or NULL if the object was
|
||||
* Returns: (transfer none): the remote connection object on success, or %NULL if the object was
|
||||
* not known
|
||||
**/
|
||||
NMRemoteConnection *
|
||||
|
|
@ -618,7 +618,7 @@ save_hostname_cb (DBusGProxy *proxy,
|
|||
/**
|
||||
* nm_remote_settings_save_hostname:
|
||||
* @settings: the %NMRemoteSettings
|
||||
* @hostname: the new persistent hostname to set, or NULL to clear any existing
|
||||
* @hostname: the new persistent hostname to set, or %NULL to clear any existing
|
||||
* persistent hostname
|
||||
* @callback: (scope async) (allow-none): callback to be called when the
|
||||
* hostname operation completes
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ nm_connection_lookup_setting_type_by_quark (GQuark error_quark)
|
|||
*
|
||||
* Create a new #NMSetting object of the desired type, given a setting name.
|
||||
*
|
||||
* Returns: (transfer full): the new setting object, or NULL if the setting name was unknown
|
||||
* Returns: (transfer full): the new setting object, or %NULL if the setting name was unknown
|
||||
**/
|
||||
NMSetting *
|
||||
nm_connection_create_setting (const char *name)
|
||||
|
|
@ -348,7 +348,7 @@ nm_connection_remove_setting (NMConnection *connection, GType setting_type)
|
|||
* Gets the #NMSetting with the given #GType, if one has been previously added
|
||||
* to the #NMConnection.
|
||||
*
|
||||
* Returns: (transfer none): the #NMSetting, or NULL if no setting of that type was previously
|
||||
* Returns: (transfer none): the #NMSetting, or %NULL if no setting of that type was previously
|
||||
* added to the #NMConnection
|
||||
**/
|
||||
NMSetting *
|
||||
|
|
@ -369,7 +369,7 @@ nm_connection_get_setting (NMConnection *connection, GType setting_type)
|
|||
* Gets the #NMSetting with the given name, if one has been previously added
|
||||
* the the #NMConnection.
|
||||
*
|
||||
* Returns: (transfer none): the #NMSetting, or NULL if no setting with that name was previously
|
||||
* Returns: (transfer none): the #NMSetting, or %NULL if no setting with that name was previously
|
||||
* added to the #NMConnection
|
||||
**/
|
||||
NMSetting *
|
||||
|
|
@ -1128,9 +1128,9 @@ nm_connection_get_path (NMConnection *connection)
|
|||
* Returns the name of the virtual kernel interface which the connection
|
||||
* needs to use if specified in the settings. This function abstracts all
|
||||
* connection types which require this functionality. For all other
|
||||
* connection types, this function will return NULL.
|
||||
* connection types, this function will return %NULL.
|
||||
*
|
||||
* Returns: Name of the kernel interface or NULL
|
||||
* Returns: Name of the kernel interface or %NULL
|
||||
*/
|
||||
const char *
|
||||
nm_connection_get_virtual_iface_name (NMConnection *connection)
|
||||
|
|
@ -1168,7 +1168,7 @@ nm_connection_new (void)
|
|||
* nm_connection_to_hash() for a description of the expected hash table.
|
||||
*
|
||||
* Returns: the new #NMConnection object, populated with settings created
|
||||
* from the values in the hash table, or NULL if the connection failed to
|
||||
* from the values in the hash table, or %NULL if the connection failed to
|
||||
* validate
|
||||
**/
|
||||
NMConnection *
|
||||
|
|
@ -1267,7 +1267,7 @@ nm_connection_get_id (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSetting8021x the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSetting8021x if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSetting8021x if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSetting8021x *
|
||||
nm_connection_get_setting_802_1x (NMConnection *connection)
|
||||
|
|
@ -1283,7 +1283,7 @@ nm_connection_get_setting_802_1x (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingBluetooth the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingBluetooth if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingBluetooth if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingBluetooth *
|
||||
nm_connection_get_setting_bluetooth (NMConnection *connection)
|
||||
|
|
@ -1299,7 +1299,7 @@ nm_connection_get_setting_bluetooth (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingBond the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingBond if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingBond if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingBond *
|
||||
nm_connection_get_setting_bond (NMConnection *connection)
|
||||
|
|
@ -1315,7 +1315,7 @@ nm_connection_get_setting_bond (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingBridge the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingBridge if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingBridge if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingBridge *
|
||||
nm_connection_get_setting_bridge (NMConnection *connection)
|
||||
|
|
@ -1331,7 +1331,7 @@ nm_connection_get_setting_bridge (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingCdma the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingCdma if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingCdma if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingCdma *
|
||||
nm_connection_get_setting_cdma (NMConnection *connection)
|
||||
|
|
@ -1347,7 +1347,7 @@ nm_connection_get_setting_cdma (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingConnection the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingConnection if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingConnection if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingConnection *
|
||||
nm_connection_get_setting_connection (NMConnection *connection)
|
||||
|
|
@ -1363,7 +1363,7 @@ nm_connection_get_setting_connection (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingGsm the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingGsm if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingGsm if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingGsm *
|
||||
nm_connection_get_setting_gsm (NMConnection *connection)
|
||||
|
|
@ -1379,7 +1379,7 @@ nm_connection_get_setting_gsm (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingInfiniband the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingInfiniband if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingInfiniband if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingInfiniband *
|
||||
nm_connection_get_setting_infiniband (NMConnection *connection)
|
||||
|
|
@ -1395,7 +1395,7 @@ nm_connection_get_setting_infiniband (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingIP4Config the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingIP4Config if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingIP4Config if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingIP4Config *
|
||||
nm_connection_get_setting_ip4_config (NMConnection *connection)
|
||||
|
|
@ -1411,7 +1411,7 @@ nm_connection_get_setting_ip4_config (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingIP6Config the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingIP6Config if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingIP6Config if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingIP6Config *
|
||||
nm_connection_get_setting_ip6_config (NMConnection *connection)
|
||||
|
|
@ -1427,7 +1427,7 @@ nm_connection_get_setting_ip6_config (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingOlpcMesh the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingOlpcMesh if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingOlpcMesh if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingOlpcMesh *
|
||||
nm_connection_get_setting_olpc_mesh (NMConnection *connection)
|
||||
|
|
@ -1443,7 +1443,7 @@ nm_connection_get_setting_olpc_mesh (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingPPP the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingPPP if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingPPP if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingPPP *
|
||||
nm_connection_get_setting_ppp (NMConnection *connection)
|
||||
|
|
@ -1459,7 +1459,7 @@ nm_connection_get_setting_ppp (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingPPPOE the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingPPPOE if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingPPPOE if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingPPPOE *
|
||||
nm_connection_get_setting_pppoe (NMConnection *connection)
|
||||
|
|
@ -1475,7 +1475,7 @@ nm_connection_get_setting_pppoe (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingSerial the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingSerial if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingSerial if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingSerial *
|
||||
nm_connection_get_setting_serial (NMConnection *connection)
|
||||
|
|
@ -1491,7 +1491,7 @@ nm_connection_get_setting_serial (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingVPN the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingVPN if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingVPN if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingVPN *
|
||||
nm_connection_get_setting_vpn (NMConnection *connection)
|
||||
|
|
@ -1507,7 +1507,7 @@ nm_connection_get_setting_vpn (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingWimax the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingWimax if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingWimax if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingWimax *
|
||||
nm_connection_get_setting_wimax (NMConnection *connection)
|
||||
|
|
@ -1523,7 +1523,7 @@ nm_connection_get_setting_wimax (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingWired the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingWired if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingWired if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingWired *
|
||||
nm_connection_get_setting_wired (NMConnection *connection)
|
||||
|
|
@ -1539,7 +1539,7 @@ nm_connection_get_setting_wired (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingAdsl the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingAdsl if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingAdsl if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingAdsl *
|
||||
nm_connection_get_setting_adsl (NMConnection *connection)
|
||||
|
|
@ -1555,7 +1555,7 @@ nm_connection_get_setting_adsl (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingWireless the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingWireless if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingWireless if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingWireless *
|
||||
nm_connection_get_setting_wireless (NMConnection *connection)
|
||||
|
|
@ -1571,7 +1571,7 @@ nm_connection_get_setting_wireless (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingWirelessSecurity the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingWirelessSecurity if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingWirelessSecurity if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingWirelessSecurity *
|
||||
nm_connection_get_setting_wireless_security (NMConnection *connection)
|
||||
|
|
@ -1587,7 +1587,7 @@ nm_connection_get_setting_wireless_security (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingBridgePort the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingBridgePort if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingBridgePort if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingBridgePort *
|
||||
nm_connection_get_setting_bridge_port (NMConnection *connection)
|
||||
|
|
@ -1603,7 +1603,7 @@ nm_connection_get_setting_bridge_port (NMConnection *connection)
|
|||
*
|
||||
* A shortcut to return any #NMSettingVlan the connection might contain.
|
||||
*
|
||||
* Returns: (transfer none): an #NMSettingVlan if the connection contains one, otherwise NULL
|
||||
* Returns: (transfer none): an #NMSettingVlan if the connection contains one, otherwise %NULL
|
||||
**/
|
||||
NMSettingVlan *
|
||||
nm_connection_get_setting_vlan (NMConnection *connection)
|
||||
|
|
|
|||
|
|
@ -490,7 +490,7 @@ path_to_scheme_value (const char *path)
|
|||
* @cert_path: when @scheme is set to either %NM_SETTING_802_1X_CK_SCHEME_PATH
|
||||
* or %NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate
|
||||
* file (PEM or DER format). The path must be UTF-8 encoded; use
|
||||
* g_filename_to_utf8() to convert if needed. Passing NULL with any @scheme
|
||||
* g_filename_to_utf8() to convert if needed. Passing %NULL with any @scheme
|
||||
* clears the CA certificate.
|
||||
* @scheme: desired storage scheme for the certificate
|
||||
* @out_format: on successful return, the type of the certificate added
|
||||
|
|
@ -568,7 +568,7 @@ nm_setting_802_1x_set_ca_cert (NMSetting8021x *self,
|
|||
*
|
||||
* Returns: the #NMSetting8021x:subject-match property. This is the
|
||||
* substring to be matched against the subject of the authentication
|
||||
* server certificate, or NULL no subject verification is to be
|
||||
* server certificate, or %NULL no subject verification is to be
|
||||
* performed.
|
||||
**/
|
||||
const char *
|
||||
|
|
@ -761,7 +761,7 @@ nm_setting_802_1x_get_client_cert_path (NMSetting8021x *setting)
|
|||
* @cert_path: when @scheme is set to either %NM_SETTING_802_1X_CK_SCHEME_PATH
|
||||
* or %NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client
|
||||
* certificate file (PEM, DER, or PKCS#12 format). The path must be UTF-8
|
||||
* encoded; use g_filename_to_utf8() to convert if needed. Passing NULL with
|
||||
* encoded; use g_filename_to_utf8() to convert if needed. Passing %NULL with
|
||||
* any @scheme clears the client certificate.
|
||||
* @scheme: desired storage scheme for the certificate
|
||||
* @out_format: on successful return, the type of the certificate added
|
||||
|
|
@ -855,7 +855,7 @@ nm_setting_802_1x_set_client_cert (NMSetting8021x *self,
|
|||
*
|
||||
* Returns: the "phase 1" PEAP version to be used when authenticating with
|
||||
* EAP-PEAP as contained in the #NMSetting8021x:phase1-peapver property. Valid
|
||||
* values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
|
||||
* values are %NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
|
||||
**/
|
||||
const char *
|
||||
nm_setting_802_1x_get_phase1_peapver (NMSetting8021x *setting)
|
||||
|
|
@ -871,7 +871,7 @@ nm_setting_802_1x_get_phase1_peapver (NMSetting8021x *setting)
|
|||
*
|
||||
* Returns: whether the "phase 1" PEAP label is new-style or old-style, to be
|
||||
* used when authenticating with EAP-PEAP, as contained in the
|
||||
* #NMSetting8021x:phase1-peaplabel property. Valid values are NULL (unset),
|
||||
* #NMSetting8021x:phase1-peaplabel property. Valid values are %NULL (unset),
|
||||
* "0" (use old-style label), and "1" (use new-style label). See the
|
||||
* wpa_supplicant documentation for more details.
|
||||
**/
|
||||
|
|
@ -1026,7 +1026,7 @@ nm_setting_802_1x_get_phase2_ca_cert_path (NMSetting8021x *setting)
|
|||
* @cert_path: when @scheme is set to either %NM_SETTING_802_1X_CK_SCHEME_PATH
|
||||
* or %NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA
|
||||
* certificate file (PEM or DER format). The path must be UTF-8 encoded; use
|
||||
* g_filename_to_utf8() to convert if needed. Passing NULL with any @scheme
|
||||
* g_filename_to_utf8() to convert if needed. Passing %NULL with any @scheme
|
||||
* clears the "phase2" CA certificate.
|
||||
* @scheme: desired storage scheme for the certificate
|
||||
* @out_format: on successful return, the type of the certificate added
|
||||
|
|
@ -1104,7 +1104,7 @@ nm_setting_802_1x_set_phase2_ca_cert (NMSetting8021x *self,
|
|||
*
|
||||
* Returns: the #NMSetting8021x:phase2-subject-match property. This is
|
||||
* the substring to be matched against the subject of the "phase 2"
|
||||
* authentication server certificate, or NULL no subject verification
|
||||
* authentication server certificate, or %NULL no subject verification
|
||||
* is to be performed.
|
||||
**/
|
||||
const char *
|
||||
|
|
@ -1301,7 +1301,7 @@ nm_setting_802_1x_get_phase2_client_cert_path (NMSetting8021x *setting)
|
|||
* @cert_path: when @scheme is set to either %NM_SETTING_802_1X_CK_SCHEME_PATH
|
||||
* or %NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client
|
||||
* certificate file (PEM, DER, or PKCS#12 format). The path must be UTF-8
|
||||
* encoded; use g_filename_to_utf8() to convert if needed. Passing NULL with
|
||||
* encoded; use g_filename_to_utf8() to convert if needed. Passing %NULL with
|
||||
* any @scheme clears the "phase2" client certificate.
|
||||
* @scheme: desired storage scheme for the certificate
|
||||
* @out_format: on successful return, the type of the certificate added
|
||||
|
|
@ -1572,7 +1572,7 @@ file_to_byte_array (const char *filename)
|
|||
* @key_path: when @scheme is set to either %NM_SETTING_802_1X_CK_SCHEME_PATH or
|
||||
* %NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file
|
||||
* (PEM, DER, or PKCS#12 format). The path must be UTF-8 encoded; use
|
||||
* g_filename_to_utf8() to convert if needed. Passing NULL with any @scheme
|
||||
* g_filename_to_utf8() to convert if needed. Passing %NULL with any @scheme
|
||||
* clears the private key.
|
||||
* @password: password used to decrypt the private key, or %NULL if the password
|
||||
* is unknown. If the password is given but fails to decrypt the private key,
|
||||
|
|
@ -1865,7 +1865,7 @@ nm_setting_802_1x_get_phase2_private_key_path (NMSetting8021x *setting)
|
|||
* @key_path: when @scheme is set to either %NM_SETTING_802_1X_CK_SCHEME_PATH or
|
||||
* %NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private
|
||||
* key file (PEM, DER, or PKCS#12 format). The path must be UTF-8 encoded;
|
||||
* use g_filename_to_utf8() to convert if needed. Passing NULL with any
|
||||
* use g_filename_to_utf8() to convert if needed. Passing %NULL with any
|
||||
* @scheme clears the private key.
|
||||
* @password: password used to decrypt the private key, or %NULL if the password
|
||||
* is unknown. If the password is given but fails to decrypt the private key,
|
||||
|
|
|
|||
|
|
@ -294,7 +294,7 @@ nm_setting_bond_remove_option (NMSettingBond *setting,
|
|||
*
|
||||
* Returns a list of valid bond options.
|
||||
*
|
||||
* Returns: (transfer none): a NULL-terminated array of strings of valid bond options.
|
||||
* Returns: (transfer none): a %NULL-terminated array of strings of valid bond options.
|
||||
**/
|
||||
const char **
|
||||
nm_setting_bond_get_valid_options (NMSettingBond *setting)
|
||||
|
|
|
|||
|
|
@ -296,7 +296,7 @@ nm_setting_connection_get_num_permissions (NMSettingConnection *setting)
|
|||
* @out_ptype: on return, the permission type (at this time, always "user")
|
||||
* @out_pitem: on return, the permission item (formatted accoring to @ptype, see
|
||||
* #NMSettingConnection:permissions for more detail
|
||||
* @out_detail: on return, the permission detail (at this time, always NULL)
|
||||
* @out_detail: on return, the permission detail (at this time, always %NULL)
|
||||
*
|
||||
* Retrieve one of the entries of the #NMSettingConnection:permissions property
|
||||
* of this setting.
|
||||
|
|
|
|||
|
|
@ -350,7 +350,7 @@ nm_setting_wired_get_s390_option (NMSettingWired *setting,
|
|||
* Returns the value associated with the s390-specific option specified by
|
||||
* @key, if it exists.
|
||||
*
|
||||
* Returns: the value, or NULL if the key/value pair was never added to the
|
||||
* Returns: the value, or %NULL if the key/value pair was never added to the
|
||||
* setting; the value is owned by the setting and must not be modified
|
||||
**/
|
||||
const char *
|
||||
|
|
@ -428,7 +428,7 @@ nm_setting_wired_remove_s390_option (NMSettingWired *setting,
|
|||
*
|
||||
* Returns a list of valid s390 options.
|
||||
*
|
||||
* Returns: (transfer none): a NULL-terminated array of strings of valid s390 options.
|
||||
* Returns: (transfer none): a %NULL-terminated array of strings of valid s390 options.
|
||||
*
|
||||
* Since: 0.9.10
|
||||
**/
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ nm_setting_to_hash (NMSetting *setting, NMSettingHashFlags flags)
|
|||
* property names and value types.
|
||||
*
|
||||
* Returns: a new #NMSetting object populated with the properties from the
|
||||
* hash table, or NULL on failure
|
||||
* hash table, or %NULL on failure
|
||||
**/
|
||||
NMSetting *
|
||||
nm_setting_new_from_hash (GType setting_type, GHashTable *hash)
|
||||
|
|
|
|||
|
|
@ -283,7 +283,7 @@ nm_utils_deinit (void)
|
|||
*
|
||||
* Returns: (transfer full): an allocated string containing a UTF-8
|
||||
* representation of the SSID, which must be freed by the caller using g_free().
|
||||
* Returns NULL on errors.
|
||||
* Returns %NULL on errors.
|
||||
**/
|
||||
char *
|
||||
nm_utils_ssid_to_utf8 (const GByteArray *ssid)
|
||||
|
|
@ -1555,7 +1555,7 @@ make_key (const char *salt,
|
|||
* nm_utils_rsa_key_encrypt:
|
||||
* @data: RSA private key data to be encrypted
|
||||
* @in_password: (allow-none): existing password to use, if any
|
||||
* @out_password: (out) (allow-none): if @in_password was NULL, a random password will be generated
|
||||
* @out_password: (out) (allow-none): if @in_password was %NULL, a random password will be generated
|
||||
* and returned in this argument
|
||||
* @error: detailed error information on return, if an error occurred
|
||||
*
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ nm_dhcp_dhclient_get_path (const char *try_first)
|
|||
* connection UUID. Also returns the "most preferred" leasefile path, which
|
||||
* may be different than any found leasefile.
|
||||
*
|
||||
* Returns: an existing leasefile, or NULL if no matching leasefile could be found
|
||||
* Returns: an existing leasefile, or %NULL if no matching leasefile could be found
|
||||
*/
|
||||
static char *
|
||||
get_dhclient_leasefile (const char *iface,
|
||||
|
|
|
|||
|
|
@ -1209,7 +1209,7 @@ bridge_created_by_nm (NMManager *self, const char *iface)
|
|||
* If @connection requires a virtual device and one does not yet exist for it,
|
||||
* creates that device.
|
||||
*
|
||||
* Returns: the #NMDevice if successfully created, NULL if not
|
||||
* Returns: the #NMDevice if successfully created, %NULL if not
|
||||
*/
|
||||
static NMDevice *
|
||||
system_create_virtual_device (NMManager *self, NMConnection *connection)
|
||||
|
|
|
|||
|
|
@ -321,7 +321,7 @@ nm_platform_link_get_ifindex (const char *name)
|
|||
* @name: Interface name
|
||||
*
|
||||
* Returns: The interface name corresponding to the given interface index
|
||||
* or NULL.
|
||||
* or %NULL.
|
||||
*/
|
||||
const char *
|
||||
nm_platform_link_get_name (int ifindex)
|
||||
|
|
|
|||
|
|
@ -214,14 +214,14 @@ build_ip6_address_or_route (const char *address_str, guint32 plen, const char *g
|
|||
|
||||
/* On success, returns pointer to the zero-terminated field (original @current).
|
||||
* The @current * pointer target is set to point to the rest of the input
|
||||
* or NULL if there is no more input. Sets error to NULL for convenience.
|
||||
* or %NULL if there is no more input. Sets error to %NULL for convenience.
|
||||
*
|
||||
* On failure, returns NULL (unspecified). The @current pointer target is
|
||||
* On failure, returns %NULL (unspecified). The @current pointer target is
|
||||
* resets to its original value to allow skipping fields. The @error target
|
||||
* is set to the character that breaks the parsing or NULL if @current was NULL.
|
||||
* is set to the character that breaks the parsing or %NULL if @current was %NULL.
|
||||
*
|
||||
* When @current target is NULL, gracefully fail returning NULL while
|
||||
* leaving the @current target NULL end setting @error to NULL;
|
||||
* When @current target is %NULL, gracefully fail returning %NULL while
|
||||
* leaving the @current target %NULL end setting @error to %NULL;
|
||||
*/
|
||||
static char *
|
||||
read_field (char **current, char **error, const char *characters, const char *delimiters)
|
||||
|
|
|
|||
Loading…
Reference in a new issue