← Back to branch summary

~rdoering/ubuntu/intrepid/erlang/fix-535090

« back to all changes in this revision

Viewing changes to erts/emulator/beam/atom.c

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2007-05-01 16:57:10 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20070501165710-2sapk0hp2gf3o0ip
Tags: 1:11.b.4-2ubuntu1
* Merge with Debian Unstable. Remaining changes:
  - Add -fno-stack-protector to fix broken crypto_drv.
* DebianMaintainerField update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
erts/emulator/beam/atom.c
232
232
}
233
233
 
234
234
int
235
 
erts_atom_get(byte* name, int len, Eterm* ap)
 
235
erts_atom_get(const char *name, int len, Eterm* ap)
236
236
{
237
237
    Atom a;
238
238
    int i;
239
239
    int res;
240
240
 
241
241
    a.len = len;
242
 
    a.name = name;
 
242
    a.name = (byte *)name;
243
243
    atom_read_lock();
244
244
    i = index_get(&erts_atom_table, (void*) &a);
245
245
    res = i < 0 ? 0 : (*ap = make_atom(i), 1);
304
304
void
305
305
dump_atoms(int to, void *to_arg)
306
306
{
307
 
    int i = erts_atom_table.size;
 
307
    int i = erts_atom_table.entries;
308
308
 
309
309
    /*
310
310
     * Print out the atom table starting from the end.