diff options
author | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-12-02 14:11:59 (GMT) |
---|---|---|
committer | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-12-02 14:11:59 (GMT) |
commit | 0021b1e62ea5c329ee523867bc2f9a5f695c4970 (patch) | |
tree | e18cb2f8d396d21a8255ec707bcb1f76864efcb8 | |
parent | b3e3f138e35160c160f0b02a3a0eaeb16f470336 (diff) |
More fixes to getter functions.
-rw-r--r-- | include/tng_io.h | 12 | ||||
-rw-r--r-- | src/lib/tng_io.c | 24 |
2 files changed, 18 insertions, 18 deletions
diff --git a/include/tng_io.h b/include/tng_io.h index c713fbd..8758c48 100644 --- a/include/tng_io.h +++ b/include/tng_io.h @@ -1632,7 +1632,7 @@ tng_function_status DECLSPECDLLEXPORT tng_molecule_system_copy(tng_trajectory_t tng_function_status DECLSPECDLLEXPORT tng_molecule_chains_get (tng_trajectory_t tng_data, tng_molecule_t molecule, - tng_chain_t *chains, + tng_chain_t **chains, int64_t *n); /** @@ -1652,7 +1652,7 @@ tng_function_status DECLSPECDLLEXPORT tng_molecule_chains_get tng_function_status DECLSPECDLLEXPORT tng_molecule_residues_get (tng_trajectory_t tng_data, tng_molecule_t molecule, - tng_residue_t *residues, + tng_residue_t **residues, int64_t *n); /** @@ -1672,7 +1672,7 @@ tng_function_status DECLSPECDLLEXPORT tng_molecule_residues_get tng_function_status DECLSPECDLLEXPORT tng_molecule_atoms_get (tng_trajectory_t tng_data, tng_molecule_t molecule, - tng_atom_t *atoms, + tng_atom_t **atoms, int64_t *n); /** @@ -1834,7 +1834,7 @@ tng_function_status DECLSPECDLLEXPORT tng_chain_name_set tng_function_status DECLSPECDLLEXPORT tng_chain_residues_get (const tng_trajectory_t tng_data, const tng_chain_t chain, - tng_residue_t *residues, + tng_residue_t **residues, int64_t *n); /** @@ -1956,7 +1956,7 @@ tng_function_status DECLSPECDLLEXPORT tng_residue_atoms_get (const tng_trajectory_t tng_data, const tng_molecule_t molecule, const tng_residue_t residue, - tng_atom_t *atoms, + tng_atom_t **atoms, int64_t *n); /** @@ -3195,7 +3195,7 @@ tng_function_status DECLSPECDLLEXPORT tng_util_trajectory_molecules_get (tng_trajectory_t tng_data, int64_t *n_mols, int64_t **molecule_cnt_list, - tng_molecule_t *mols); + tng_molecule_t **mols); /* * @brief High-level function for adding a molecule to the mol system. diff --git a/src/lib/tng_io.c b/src/lib/tng_io.c index 3ce0625..7084b4a 100644 --- a/src/lib/tng_io.c +++ b/src/lib/tng_io.c @@ -7593,7 +7593,7 @@ tng_function_status DECLSPECDLLEXPORT tng_molecule_system_copy(tng_trajectory_t tng_function_status DECLSPECDLLEXPORT tng_molecule_chains_get (const tng_trajectory_t tng_data, const tng_molecule_t molecule, - tng_chain_t *chains, + tng_chain_t **chains, int64_t *n) { (void) tng_data; @@ -7601,7 +7601,7 @@ tng_function_status DECLSPECDLLEXPORT tng_molecule_chains_get TNG_ASSERT(chains, "TNG library: chains must not be a NULL pointer"); TNG_ASSERT(n, "TNG library: n must not be a NULL pointer"); - *chains = molecule->chains; + *chains = &molecule->chains; *n = molecule->n_chains; return(TNG_SUCCESS); @@ -7610,7 +7610,7 @@ tng_function_status DECLSPECDLLEXPORT tng_molecule_chains_get tng_function_status DECLSPECDLLEXPORT tng_molecule_residues_get (const tng_trajectory_t tng_data, const tng_molecule_t molecule, - tng_residue_t *residues, + tng_residue_t **residues, int64_t *n) { (void) tng_data; @@ -7618,7 +7618,7 @@ tng_function_status DECLSPECDLLEXPORT tng_molecule_residues_get TNG_ASSERT(residues, "TNG library: residues must not be a NULL pointer"); TNG_ASSERT(n, "TNG library: n must not be a NULL pointer"); - residues = &molecule->residues; + *residues = &molecule->residues; *n = molecule->n_residues; return(TNG_SUCCESS); @@ -7627,7 +7627,7 @@ tng_function_status DECLSPECDLLEXPORT tng_molecule_residues_get tng_function_status DECLSPECDLLEXPORT tng_molecule_atoms_get (const tng_trajectory_t tng_data, const tng_molecule_t molecule, - tng_atom_t *atoms, + tng_atom_t **atoms, int64_t *n) { (void) tng_data; @@ -7635,7 +7635,7 @@ tng_function_status DECLSPECDLLEXPORT tng_molecule_atoms_get TNG_ASSERT(atoms, "TNG library: atoms must not be a NULL pointer"); TNG_ASSERT(n, "TNG library: n must not be a NULL pointer"); - atoms = &molecule->atoms; + *atoms = &molecule->atoms; *n = molecule->n_atoms; return(TNG_SUCCESS); @@ -7878,7 +7878,7 @@ tng_function_status DECLSPECDLLEXPORT tng_chain_name_set tng_function_status DECLSPECDLLEXPORT tng_chain_residues_get (const tng_trajectory_t tng_data, const tng_chain_t chain, - tng_residue_t *residues, + tng_residue_t **residues, int64_t *n) { (void) tng_data; @@ -7886,7 +7886,7 @@ tng_function_status DECLSPECDLLEXPORT tng_chain_residues_get TNG_ASSERT(residues, "TNG library: residues must not be a NULL pointer"); TNG_ASSERT(n, "TNG library: n must not be a NULL pointer"); - *residues = chain->residues; + *residues = &chain->residues; *n = chain->n_residues; return(TNG_SUCCESS); @@ -8089,7 +8089,7 @@ tng_function_status DECLSPECDLLEXPORT tng_residue_atoms_get (const tng_trajectory_t tng_data, const tng_molecule_t molecule, const tng_residue_t residue, - tng_atom_t *atoms, + tng_atom_t **atoms, int64_t *n) { (void) tng_data; @@ -8097,7 +8097,7 @@ tng_function_status DECLSPECDLLEXPORT tng_residue_atoms_get TNG_ASSERT(atoms, "TNG library: atoms must not be a NULL pointer"); TNG_ASSERT(n, "TNG library: n must not be a NULL pointer"); - *atoms = &molecule->atoms[residue->atoms_offset]; + **atoms = &molecule->atoms[residue->atoms_offset]; *n = residue->n_atoms; return(TNG_SUCCESS); @@ -15711,7 +15711,7 @@ tng_function_status DECLSPECDLLEXPORT tng_util_trajectory_molecules_get (tng_trajectory_t tng_data, int64_t *n_mols, int64_t **molecule_cnt_list, - tng_molecule_t *mols) + tng_molecule_t **mols) { tng_trajectory_frame_set_t frame_set; @@ -15730,7 +15730,7 @@ tng_function_status DECLSPECDLLEXPORT tng_util_trajectory_molecules_get *molecule_cnt_list = tng_data->molecule_cnt_list; } - *mols = tng_data->molecules; + *mols = &tng_data->molecules; return(TNG_SUCCESS); } |